Fix LayoutProvider not being available on Debian

Auditors: @bridiver
brave · Jun 29, 2017 · f044e9e · f044e9e
1 parent 88ed1cb
commit f044e9e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
@@ -72,6 +72,7 @@ void MenuBar::SetMenu(AtomMenuModel* model) {
     button->SetTextColor(views::Button::STATE_PRESSED, highlight_color_);
     button->SetTextColor(views::Button::STATE_HOVERED, hover_color_);
     button->SetUnderlineColor(enabled_color_);
+    button->SetEnabledTextColors(SK_ColorBLACK);
 #elif defined(OS_WIN)
     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_GRAYTEXT));
 #endif

diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
@@ -253,6 +253,14 @@ source_set("browser") {
       "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
       "//chrome/browser/extensions/global_shortcut_listener_x11.h",
       "chrome/browser/ui/process_singleton_dialog_linux.cc",
+      "//chrome/browser/ui/views/harmony/chrome_layout_provider.cc",
+      "//chrome/browser/ui/views/harmony/chrome_layout_provider.h",
+      "//chrome/browser/ui/views/harmony/chrome_typography.cc",
+      "//chrome/browser/ui/views/harmony/chrome_typography.h",
+      "//chrome/browser/ui/views/harmony/harmony_layout_provider.cc",
+      "//chrome/browser/ui/views/harmony/harmony_layout_provider.h",
+      "//chrome/browser/ui/views/harmony/harmony_typography_provider.cc",
+      "//chrome/browser/ui/views/harmony/harmony_typography_provider.h",
     ]
   }
 

diff --git a/vendor/brightray/browser/browser_main_parts.cc b/vendor/brightray/browser/browser_main_parts.cc
@@ -29,6 +29,7 @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "browser/views/views_delegate.h"
+#include "chrome/browser/ui/views/harmony/harmony_layout_provider.h"
 #endif
 
 #if defined(USE_X11)
@@ -186,7 +187,9 @@ void BrowserMainParts::ToolkitInitialized() {
 #endif
 
 #if defined(TOOLKIT_VIEWS)
-  views_delegate_.reset(new ViewsDelegate);
+  views_delegate_ = base::MakeUnique<ViewsDelegate>();
+ if (!views::LayoutProvider::Get())
+    layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
 #endif
 
 #if defined(OS_WIN)

diff --git a/vendor/brightray/browser/browser_main_parts.h b/vendor/brightray/browser/browser_main_parts.h
@@ -13,6 +13,9 @@
 namespace brightray {
 class ViewsDelegate;
 }
+namespace views {
+class LayoutProvider;
+}
 #endif
 
 #if defined(USE_AURA) && defined(USE_X11)
@@ -46,6 +49,7 @@ class BrowserMainParts : public content::BrowserMainParts {
 
 #if defined(TOOLKIT_VIEWS)
   std::unique_ptr<ViewsDelegate> views_delegate_;
+  std::unique_ptr<views::LayoutProvider> layout_provider_;
 #endif
 
 #if defined(USE_AURA) && defined(USE_X11)