[MD] Don't use new OTR native-theming when using a custom browser theme.

chrome/browser/ui/views/frame/browser_frame.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/widget/widget.h"
 
 class AvatarMenuButton;
 class BrowserRootView;
 class BrowserView;
 class NativeBrowserFrame;
 class NonClientFrameView;
 class SystemMenuModelBuilder;
+class ThemeService;
 
 namespace gfx {
 class FontList;
 class Rect;
 }
 
 namespace ui {
 class EventHandler;
 class MenuModel;
-class ThemeProvider;
 }
 
 namespace views {
 class MenuRunner;
 class View;
 }
 
 // This is a virtual interface that allows system specific browser frames.
 class BrowserFrame
     : public views::Widget,
@@ skipping 53 matching lines @@
 
   // Called when BrowserView creates all it's child views.
   void OnBrowserViewInitViewsComplete();
 
   // Overridden from views::Widget:
   views::internal::RootView* CreateRootView() override;
   views::NonClientFrameView* CreateNonClientFrameView() override;
   bool GetAccelerator(int command_id,
                       ui::Accelerator* accelerator) const override;
   const ui::ThemeProvider* GetThemeProvider() const override;
+  const ui::NativeTheme* GetNativeTheme() const override;
   void SchedulePaintInRect(const gfx::Rect& rect) override;
   void OnNativeWidgetActivationChanged(bool active) override;
 
   // Overridden from views::ContextMenuController:
   void ShowContextMenuForView(views::View* source,
                               const gfx::Point& p,
                               ui::MenuSourceType source_type) override;
 
   AvatarMenuButton* GetAvatarMenuButton();
 
@@ skipping 18 matching lines @@
 
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;
 
   scoped_ptr<SystemMenuModelBuilder> menu_model_builder_;
 
   // Used to show the system menu. Only used if
   // NativeBrowserFrame::UsesNativeSystemMenu() returns false.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
-  const ui::ThemeProvider* theme_provider_;
+  const ThemeService* theme_service_;
 
   scoped_ptr<ui::EventHandler> browser_command_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_