MacViews: Don't draw custom frame on Mac

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/browser_root_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
 #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"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/session/session_state_delegate.h"
@@ skipping 24 matching lines @@
 }
 
 // static
 const gfx::FontList& BrowserFrame::GetTitleFontList() {
   static const gfx::FontList* title_font_list = new gfx::FontList();
   ANNOTATE_LEAKING_OBJECT_PTR(title_font_list);
   return *title_font_list;
 }
 
 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();
   params.delegate = browser_view_;
   if (browser_view_->browser()->is_type_tabbed()) {
     // Typed panel/popup can only return a size once the widget has been
     // created.
     chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(),
                                              &params.bounds,
                                              &params.show_state);
@@ skipping 43 matching lines @@
 
 views::View* BrowserFrame::GetLocationIconView() const {
   return browser_frame_view_->GetLocationIconView();
 }
 
 views::View* BrowserFrame::GetFrameView() const {
   return browser_frame_view_;
 }
 
 bool BrowserFrame::UseCustomFrame() const {
-  return use_custom_frame_pref_.GetValue() &&
-      browser_view_->IsBrowserTypeNormal();
+  return native_browser_frame_->UseCustomFrame();
 }
 
 bool BrowserFrame::ShouldSaveWindowPlacement() const {
   return native_browser_frame_->ShouldSaveWindowPlacement();
 }
 
 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
                                       ui::WindowShowState* show_state) const {
   return native_browser_frame_->GetWindowPlacement(bounds, show_state);
 }
@@ skipping 100 matching lines @@
   return browser_frame_view_->avatar_button();
 }
 
 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->new_avatar_button();
 }
 
 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();
-}