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

chrome/browser/views/tabs/tab_strip.cc

 // Copyright (c) 2010 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/views/tabs/tab_strip.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
+#include "base/command_line.h"
 #include "base/stl_util-inl.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/view_ids.h"
+#include "chrome/browser/views/app_launcher.h"
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/path.h"
 #include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
 #include "views/painter.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
@@ skipping 777 matching lines @@
   }
   LoadNewTabButtonImage();
   newtab_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_NEWTAB));
   AddChildView(newtab_button_);
 }
 
 bool TabStrip::IsCompatibleWith(TabStrip* other) const {
   return model_->profile() == other->model()->profile();
 }
 
+gfx::Rect TabStrip::GetNewTabButtonBounds() {
+  return newtab_button_->bounds();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TabStrip, BaseTabStrip implementation:
 
 int TabStrip::GetPreferredHeight() {
   return GetPreferredSize().height();
 }
 
 void TabStrip::SetBackgroundOffset(const gfx::Point& offset) {
   int tab_count = GetTabCount();
   for (int i = 0; i < tab_count; ++i)
@@ skipping 561 matching lines @@
 
 bool TabStrip::HasAvailableDragActions() const {
   return model_->delegate()->GetDragActions() != 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, views::BaseButton::ButtonListener implementation:
 
 void TabStrip::ButtonPressed(views::Button* sender, const views::Event& event) {
   if (sender == newtab_button_) {
+    // TODO(jcampan): if we decide to keep the app launcher as the default
+    //                behavior for the new tab button, we should add a method
+    //                on the TabStripDelegate to do so.
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kAppLauncherForNewTab)) {
+      NavigationController& controller =
+          model_->GetSelectedTabContents()->controller();
+      AppLauncher::Show(Browser::GetBrowserForController(&controller, NULL));
+      return;
+    }
     UserMetrics::RecordAction("NewTab_Button", model_->profile());
     model_->delegate()->AddBlankTab(true);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, MessageLoop::Observer implementation:
 
 #if defined(OS_WIN)
 void TabStrip::WillProcessMessage(const MSG& msg) {
@@ skipping 638 matching lines @@
   }
 }
 
 bool TabStrip::HasPhantomTabs() const {
   for (int i = 0; i < GetTabCount(); ++i) {
     if (GetTabAt(i)->phantom())
       return true;
   }
   return false;
 }