Removing the app launcher button on ChromeOS

chrome/browser/views/tabs/browser_tab_strip_controller.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/browser_tab_strip_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 234 matching lines @@
   }
 }
 
 bool BrowserTabStripController::IsCompatibleWith(BaseTabStrip* other) const {
   Profile* other_profile =
       static_cast<BrowserTabStripController*>(other->controller())->profile();
   return other_profile == profile();
 }
 
 void BrowserTabStripController::CreateNewTab() {
-  // 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::kAppsPanel)) {
-    NavigationController& controller =
-        model_->GetSelectedTabContents()->controller();
-    AppLauncher::ShowForNewTab(
-        Browser::GetBrowserForController(&controller, NULL), std::string());
-    return;
-  }
   UserMetrics::RecordAction(UserMetricsAction("NewTab_Button"),
                             model_->profile());
+
+  Browser* browser = model_->GetSelectedTabContents()->delegate()->GetBrowser();
+  if (browser->OpenAppsPanelAsNewTab())
+    return;
+
   model_->delegate()->AddBlankTab(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, TabStripModelObserver implementation:
 
 void BrowserTabStripController::TabInsertedAt(TabContents* contents,
                                               int model_index,
                                               bool foreground) {
   DCHECK(contents);
@@ skipping 116 matching lines @@
 void BrowserTabStripController::StopHighlightTabsForCommand(
     TabStripModel::ContextMenuCommand command_id,
     BaseTabRenderer* tab) {
   if (command_id == TabStripModel::CommandCloseTabsOpenedBy ||
       command_id == TabStripModel::CommandCloseTabsToRight ||
       command_id == TabStripModel::CommandCloseOtherTabs) {
     // Just tell all Tabs to stop pulsing - it's safe.
     tabstrip_->StopAllHighlighting();
   }
 }