MacViews: Get chrome/browser/ui/views/frame to compile

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 "ash/shell.h"

[tapted, 2014/11/04 02:33:42]

remove?

[Andre, 2014/11/05 02:04:22]

Needed for ash::Shell:GetInstance().
Moved inside #if(OS_CHROMEOS) guard.

 #include "base/command_line.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/ash/ash_util.h"

[tapted, 2014/11/04 02:33:42]

remove? or guard in #if ash

[Andre, 2014/11/05 02:04:23]

No longer needed, deleted.

 #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/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "ui/aura/window.h"

[tapted, 2014/11/04 02:33:42]

remove?

[Andre, 2014/11/05 02:04:22]

Removed.

 #include "ui/aura/window_event_dispatcher.h"

[tapted, 2014/11/04 02:33:42]

remove?

[Andre, 2014/11/05 02:04:23]

Removed.

 #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_LINUX) && !defined(OS_CHROMEOS)
 #include "chrome/browser/shell_integration_linux.h"
@@ skipping 14 matching lines @@
     : native_browser_frame_(NULL),
       root_view_(NULL),
       browser_frame_view_(NULL),
       browser_view_(browser_view),
       theme_provider_(ThemeServiceFactory::GetForProfile(
                           browser_view_->browser()->profile())) {
   browser_view_->set_frame(this);
   set_is_secondary_widget(false);
   // Don't focus anything on creation, selecting a tab will set the focus.
   set_focus_on_creation(false);
-
-#if defined(USE_X11)
-  browser_command_handler_.reset(
-      new BrowserCommandHandlerX11(browser_view_->browser()));
-#endif
 }
 
 BrowserFrame::~BrowserFrame() {
-  if (browser_command_handler_ && GetNativeView())
-    GetNativeView()->RemovePreTargetHandler(browser_command_handler_.get());
 }
 
 // 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;
   params.delegate = browser_view_;
   params.native_widget = native_browser_frame_->AsNativeWidget();
   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);
   }
 
+#if defined(USE_ASH)
   if (browser_view_->browser()->host_desktop_type() ==

[tapted, 2014/11/04 02:33:42]

This feels out of place here... the condition is essentially what's in
NativeBrowserFrameFactory::ShouldCreateForAshDesktop(), which is called from
NativeBrowserFrameFactory::Create() in the _auralinux and _aurawin versions.

I'm thinking maybe an interface like

class NativeBrowserFrame {
 public:
  /* .. */
  virtual views::Widget::InitParams WidgetParams() const = 0;


That might also allow you to get rid the NativeBrowserFrame::AsNativeWidget
interfaces (although codesearch might be hiding some other callers), as well as
some further #includes from this file

[Andre, 2014/11/05 02:04:23]

Done.

       chrome::HOST_DESKTOP_TYPE_ASH || chrome::ShouldOpenAshOnStartup()) {
     params.context = ash::Shell::GetPrimaryRootWindow();
 #if defined(OS_WIN)
     // If this window is under ASH on Windows, we need it to be translucent.
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
 #endif
   }
+#endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Set up a custom WM_CLASS for some sorts of window types. This allows
   // task switchers in X11 environments to distinguish between main browser
   // windows and e.g app windows.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   const Browser& browser = *browser_view_->browser();
   params.wm_class_class = shell_integration_linux::GetProgramClassName();
   params.wm_class_name = params.wm_class_class;
   if (browser.is_app() && !browser.is_devtools()) {
@@ skipping 19 matching lines @@
                                   : Widget::FRAME_TYPE_FORCE_NATIVE);
 #endif  // defined(OS_LINUX)
 
   Init(params);
 
   if (!native_browser_frame_->UsesNativeSystemMenu()) {
     DCHECK(non_client_view());
     non_client_view()->set_context_menu_controller(this);
   }
 
-  if (browser_command_handler_)
-    GetNativeWindow()->AddPreTargetHandler(browser_command_handler_.get());
+#if defined(USE_X11)
+  browser_command_handler_.reset(
+      new BrowserCommandHandlerX11(browser_view_->browser()));
+#endif
 }
 
 void BrowserFrame::SetThemeProvider(scoped_ptr<ui::ThemeProvider> provider) {
   owned_theme_provider_ = provider.Pass();
   theme_provider_ = owned_theme_provider_.get();
 }
 
 int BrowserFrame::GetMinimizeButtonOffset() const {
   return native_browser_frame_->GetMinimizeButtonOffset();
 }
@@ skipping 143 matching lines @@
 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();
 }