Merge 48149 - Relanding 48042....

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 85 matching lines @@
 
 // Triggers a pletora of diagnostic modes.
 const char kDiagnostics[]                   = "diagnostics";
 
 // Disables the alternate window station for the renderer.
 const char kDisableAltWinstation[]          = "disable-winsta";
 
 // Disable the ApplicationCache.
 const char kDisableApplicationCache[]       = "disable-application-cache";
 
-// Disables the app launcher popup when a new tab is created, directly creates
-// a tab instead. Takes precedence over kAppLauncherForNewTab.
-// TODO(jcivelli): http://crbug.com/44089 this flag is required for some tests
-//                 to work, as showing the app launcher is the default on
-//                 ChromeOS but not on other platforms. Tests should be fixed
-//                 once it becomes the default behavior on all platforms.
-const char kDisableAppsPanel[]              = "disable-apps-panel";
-
 // Replaces the audio IPC layer for <audio> and <video> with a mock audio
 // device, useful when using remote desktop or machines without sound cards.
 // This is temporary until we fix the underlying problem.
 //
 // TODO(scherkus): remove --disable-audio when we have a proper fallback
 // mechanism.
 const char kDisableAudio[]                  = "disable-audio";
 
 // Disable CNAME lookup of the host when generating the Kerberos SPN for a
 // Negotiate challenge. See HttpAuthHandlerNegotiate::CreateSPN
@@ skipping 845 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches