Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 165422: Merge 22375 - Enable JumpList by default on Windows 7.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/common/chrome_switches.cc:r22375
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 // Number of tabs to pin on startup. This is not use if session restore is 541 // Number of tabs to pin on startup. This is not use if session restore is
542 // enabled. 542 // enabled.
543 const wchar_t kPinnedTabCount[] = L"pinned-tab-count"; 543 const wchar_t kPinnedTabCount[] = L"pinned-tab-count";
544 544
545 // Enable local storage. Still buggy. 545 // Enable local storage. Still buggy.
546 const wchar_t kEnableLocalStorage[] = L"enable-local-storage"; 546 const wchar_t kEnableLocalStorage[] = L"enable-local-storage";
547 547
548 // Enable session storage. Still buggy. 548 // Enable session storage. Still buggy.
549 const wchar_t kEnableSessionStorage[] = L"enable-session-storage"; 549 const wchar_t kEnableSessionStorage[] = L"enable-session-storage";
550 550
551 // Enables the custom JumpList on Windows 7. 551 // Disables the custom JumpList on Windows 7.
552 const wchar_t kEnableCustomJumpList[] = L"enable-custom-jumplist"; 552 const wchar_t kDisableCustomJumpList[] = L"disable-custom-jumplist";
553 553
554 } // namespace switches 554 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698