MacViews: Fix BrowserClient for toolkit-views on Mac

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/env.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/native_widget_aura.h"
+#include "ui/wm/core/wm_state.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "chrome/common/pref_names.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ skipping 68 matching lines @@
     views::LinuxUI::SetInstance(gtk2_ui);
   } else {
     // TODO(erg): Eventually, we'll need to somehow support IMEs in ash on
     // Linux.
     ui::InitializeInputMethodForTesting();
   }
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
+  wm_state_.reset(new wm::WMState);
+
 #if !defined(OS_CHROMEOS)
 #if defined(USE_ASH)
   CHECK(aura::Env::GetInstance());
   active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop()));
 #endif
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
   if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH)
     views::LinuxUI::instance()->Initialize();
@@ skipping 47 matching lines @@
                            chrome::MESSAGE_BOX_TYPE_WARNING);
 
     // Avoids gpu_process_transport_factory.cc(153)] Check failed:
     // per_compositor_data_.empty() when quit is chosen.
     base::RunLoop().RunUntilIdle();
 
     exit(EXIT_FAILURE);
   }
 }
 #endif