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

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 890d1de39f44d826d043ff78ecae160f89bf125e..15e41d2c4acdbcf4f3f31aa24b2891b8bda257bf 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -62,16 +62,9 @@ BrowserFrame::BrowserFrame(BrowserView* browser_view)
   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
@@ -101,6 +94,7 @@ void BrowserFrame::InitBrowserFrame() {
                                              &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();
@@ -109,6 +103,7 @@ void BrowserFrame::InitBrowserFrame() {
     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
@@ -148,8 +143,10 @@ void BrowserFrame::InitBrowserFrame() {
     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) {