chromium-browser-stable/chromium-61.0.3163.91-Fix_compilation_failures_for_arm64.patch
2017-09-19 15:32:00 +03:00

32 lines
1.1 KiB
Diff

diff --git a/chrome/browser/devtools/devtools_file_system_indexer.cc b/chrome/browser/devtools/devtools_file_system_indexer.cc
index 87efb80..576a620 100644
--- a/chrome/browser/devtools/devtools_file_system_indexer.cc
+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
@@ -34,12 +34,13 @@
using base::TimeTicks;
using content::BrowserThread;
using std::map;
-using std::set;
using std::string;
using std::vector;
namespace {
+using std::set;
+
base::SequencedTaskRunner* impl_task_runner() {
constexpr base::TaskTraits kBlockingTraits = {base::MayBlock(),
base::TaskPriority::BACKGROUND};
diff --git a/ui/views/examples/box_layout_example.h b/ui/views/examples/box_layout_example.h
index 7695045..d6b0a2c 100644
--- a/ui/views/examples/box_layout_example.h
+++ b/ui/views/examples/box_layout_example.h
@@ -38,7 +38,7 @@
void CreateExampleView(View* container) override;
private:
- friend class ChildPanel;
+ friend class views::examples::ChildPanel;
// ButtonListener
void ButtonPressed(Button* sender, const ui::Event& event) override;