Porting the app launcher to Windows, and adding an experimental flag...

chrome/browser/chromeos/frame/browser_view.cc

Index: chrome/browser/chromeos/frame/browser_view.cc
===================================================================
--- chrome/browser/chromeos/frame/browser_view.cc	(revision 42236)
+++ chrome/browser/chromeos/frame/browser_view.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "app/menus/simple_menu_model.h"
 #include "app/theme_provider.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/chromeos/app_launcher.h"
 #include "chrome/browser/chromeos/compact_location_bar_host.h"
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/view_ids.h"
+#include "chrome/browser/views/app_launcher.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
 #include "chrome/browser/views/frame/browser_view.h"
@@ -338,7 +338,6 @@
 
 BrowserView::BrowserView(Browser* browser)
     : ::BrowserView(browser),
-      main_menu_(NULL),
       main_menu_button_(NULL),
       status_area_(NULL),
       compact_navigation_bar_(NULL),
@@ -458,10 +457,7 @@
 // views::ButtonListener overrides.
 void BrowserView::ButtonPressed(views::Button* sender,
                                 const views::Event& event) {
-  if (!main_menu_.get()) {
-    main_menu_.reset(new AppLauncher(browser()));
-  }
-  main_menu_->Show();
+  AppLauncher::Show(browser());
 }
 
 // views::ContextMenuController overrides.