MacViews: Don't draw custom frame on Mac

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

Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index b706c61116fc180d3f1f548e1daa329a4c11e6d6..a29497aebb40d807141277bd78ebff1ca085db59 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
-#include "chrome/common/pref_names.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event_handler.h"
@@ -65,12 +64,6 @@ const gfx::FontList& BrowserFrame::GetTitleFontList() {
 }
 
 void BrowserFrame::InitBrowserFrame() {
-  use_custom_frame_pref_.Init(
-      prefs::kUseCustomChromeFrame,
-      browser_view_->browser()->profile()->GetPrefs(),
-      base::Bind(&BrowserFrame::OnUseCustomChromeFrameChanged,
-                 base::Unretained(this)));
-
   native_browser_frame_ =
       NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_);
   views::Widget::InitParams params = native_browser_frame_->GetWidgetParams();
@@ -134,8 +127,7 @@ views::View* BrowserFrame::GetFrameView() const {
 }
 
 bool BrowserFrame::UseCustomFrame() const {
-  return use_custom_frame_pref_.GetValue() &&
-      browser_view_->IsBrowserTypeNormal();
+  return native_browser_frame_->UseCustomFrame();
 }
 
 bool BrowserFrame::ShouldSaveWindowPlacement() const {
@@ -256,10 +248,3 @@ NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
   return !IsMaximized();
 }
-
-void BrowserFrame::OnUseCustomChromeFrameChanged() {
-  // Tell the window manager to add or remove system borders.
-  set_frame_type(UseCustomFrame() ? Widget::FRAME_TYPE_FORCE_CUSTOM
-                                  : Widget::FRAME_TYPE_FORCE_NATIVE);
-  FrameTypeChanged();
-}