summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 10:46:50 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 10:46:50 +0000
commit52110278125f17b8f2a99a12c03e14e816e65226 (patch)
tree9aaee8d5577fdafd8d0ff7cdffe1e796cf9ccc48 /chrome
parent999f6fdeb32f97fcaf94632213f0e2e1b49267e4 (diff)
downloadchromium_src-52110278125f17b8f2a99a12c03e14e816e65226.zip
chromium_src-52110278125f17b8f2a99a12c03e14e816e65226.tar.gz
chromium_src-52110278125f17b8f2a99a12c03e14e816e65226.tar.bz2
Enable JumpList by default on Windows 7.
This change enables our custom JumpList by default, i.e. enables our custom JumpList when Chromium is launched without a "--disable-custom-jumplist" option. BUG=8037 TEST=Right-click the taskbar icon of Chromium on Windows 7. Review URL: http://codereview.chromium.org/159398 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/jumplist.cc4
-rw-r--r--chrome/browser/jumplist.h2
-rw-r--r--chrome/common/chrome_switches.cc4
-rw-r--r--chrome/common/chrome_switches.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/jumplist.cc b/chrome/browser/jumplist.cc
index 2732971..fcf39e6 100644
--- a/chrome/browser/jumplist.cc
+++ b/chrome/browser/jumplist.cc
@@ -538,8 +538,8 @@ JumpList::~JumpList() {
// static
bool JumpList::Enabled() {
return (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 &&
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableCustomJumpList));
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCustomJumpList));
}
bool JumpList::AddObserver(Profile* profile) {
diff --git a/chrome/browser/jumplist.h b/chrome/browser/jumplist.h
index 265377a..e107482 100644
--- a/chrome/browser/jumplist.h
+++ b/chrome/browser/jumplist.h
@@ -121,7 +121,7 @@ class JumpList : public TabRestoreService::Observer {
// Returns true if the custom JumpList is enabled.
// We use the custom JumpList when we satisfy the following conditions:
// * Chromium is running on Windows 7 and;
- // * Chromium is lauched with an "--enable-custom-jumplist" option.
+ // * Chromium is lauched without a "--disable-custom-jumplist" option.
// TODO(hbono): to be enabled by default when we finalize the categories and
// items of our JumpList.
static bool Enabled();
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6b8c8a2..6b58fae 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -556,8 +556,8 @@ const wchar_t kAllowSandboxDebugging[] = L"allow-sandbox-debugging";
// Triggers a pletora of diagnostic modes.
const wchar_t kDiagnostics[] = L"diagnostics";
-// Enables the custom JumpList on Windows 7.
-const wchar_t kEnableCustomJumpList[] = L"enable-custom-jumplist";
+// Disables the custom JumpList on Windows 7.
+const wchar_t kDisableCustomJumpList[] = L"disable-custom-jumplist";
// Enables full core dump reporting for Googlers only (Linux only).
const wchar_t kGoogleInternalCrashReporting[] =
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 4794b71..cd99855 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -216,7 +216,7 @@ extern const wchar_t kAllowSandboxDebugging[];
extern const wchar_t kDiagnostics[];
-extern const wchar_t kEnableCustomJumpList[];
+extern const wchar_t kDisableCustomJumpList[];
extern const wchar_t kGoogleInternalCrashReporting[];