X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchrome%2Fbrowser%2Fui%2Fviews%2Fframe%2Fopaque_browser_frame_view_linux.cc;h=2c58ffe491933970ad926872a44a1b81406f3384;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=b911e6f5a058f8beb6029b09a155b93f1931feaa;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
index b911e6f..2c58ffe 100644
--- a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
+++ b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h"
 
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ -13,9 +15,11 @@
 
 OpaqueBrowserFrameViewLinux::OpaqueBrowserFrameViewLinux(
     OpaqueBrowserFrameView* view,
-    OpaqueBrowserFrameViewLayout* layout)
+    OpaqueBrowserFrameViewLayout* layout,
+    Profile* profile)
     : view_(view),
-      layout_(layout) {
+      layout_(layout),
+      theme_service_(ThemeServiceFactory::GetForProfile(profile)) {
   views::LinuxUI* ui = views::LinuxUI::instance();
   if (ui)
     ui->AddWindowButtonOrderObserver(this);
@@ -27,6 +31,12 @@ OpaqueBrowserFrameViewLinux::~OpaqueBrowserFrameViewLinux() {
     ui->RemoveWindowButtonOrderObserver(this);
 }
 
+bool OpaqueBrowserFrameViewLinux::IsUsingNativeTheme() {
+  // On X11, this does the correct thing. On Windows, UsingNativeTheme() will
+  // return true when using the default blue theme too.
+  return theme_service_->UsingNativeTheme();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameViewLinux,
 //     views::WindowButtonOrderObserver implementation:
@@ -52,6 +62,7 @@ void OpaqueBrowserFrameViewLinux::OnWindowButtonOrderingChange(
 OpaqueBrowserFrameViewPlatformSpecific*
 OpaqueBrowserFrameViewPlatformSpecific::Create(
       OpaqueBrowserFrameView* view,
-      OpaqueBrowserFrameViewLayout* layout) {
-  return new OpaqueBrowserFrameViewLinux(view, layout);
+      OpaqueBrowserFrameViewLayout* layout,
+      Profile* profile) {
+  return new OpaqueBrowserFrameViewLinux(view, layout, profile);
 }