summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 01:18:07 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 01:18:07 +0000
commit2bce5e17baa53ab9547a0dd8bb4c5eb005277264 (patch)
treea39552d4d2fa97b3781cf7331b9b8ad96c5cceb4 /chrome/browser/browser.cc
parentf6f2073d8c8fff901501eb4cc3f3e30a5467d608 (diff)
downloadchromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.zip
chromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.tar.gz
chromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.tar.bz2
Re-land r47079: Shorten several appsrelated flags.
TBR=rafaelw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 80f5004..aee74e5 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1249,8 +1249,7 @@ void Browser::CloseWindow() {
void Browser::NewTab() {
UserMetrics::RecordAction(UserMetricsAction("NewTab"), profile_);
#if defined(OS_WIN)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAppLauncherForNewTab)) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsPanel)) {
AppLauncher::ShowForNewTab(this, std::string());
return;
}
@@ -2060,8 +2059,7 @@ void Browser::ExecuteCommand(int id) {
TabContents* Browser::AddBlankTab(bool foreground) {
// To make a more "launchy" experience, try to reuse an existing NTP if there
// is one.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableExtensionApps)) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
for (int i = tabstrip_model_.count() - 1; i >= 0; --i) {
TabContents* contents = tabstrip_model_.GetTabContentsAt(i);
if (StartsWithASCII(contents->GetURL().spec(),