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

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

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/browser/jumplist.cc ('k') | chrome/common/chrome_switches.cc » ('j') | 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.h: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 // Defines all the command-line switches used by Chrome. 5 // Defines all the command-line switches used by Chrome.
6 6
7 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_ 7 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_
8 #define CHROME_COMMON_CHROME_SWITCHES_H_ 8 #define CHROME_COMMON_CHROME_SWITCHES_H_
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 extern const wchar_t kRendererCrashDump[]; 205 extern const wchar_t kRendererCrashDump[];
206 206
207 extern const wchar_t kEnableTabtastic2[]; 207 extern const wchar_t kEnableTabtastic2[];
208 208
209 extern const wchar_t kPinnedTabCount[]; 209 extern const wchar_t kPinnedTabCount[];
210 210
211 extern const wchar_t kEnableLocalStorage[]; 211 extern const wchar_t kEnableLocalStorage[];
212 212
213 extern const wchar_t kEnableSessionStorage[]; 213 extern const wchar_t kEnableSessionStorage[];
214 214
215 extern const wchar_t kEnableCustomJumpList[]; 215 extern const wchar_t kDisableCustomJumpList[];
216 216
217 } // namespace switches 217 } // namespace switches
218 218
219 #endif // CHROME_COMMON_CHROME_SWITCHES_H_ 219 #endif // CHROME_COMMON_CHROME_SWITCHES_H_
OLDNEW
« no previous file with comments | « chrome/browser/jumplist.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698