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

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

Issue 2843413003: [Views] App Menu Icon Update (Closed)
Patch Set: Fix for isherman Created 3 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ppapi/features/features.h" 10 #include "ppapi/features/features.h"
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 const char kEnableWaylandServer[] = "enable-wayland-server"; 1132 const char kEnableWaylandServer[] = "enable-wayland-server";
1133 #endif 1133 #endif
1134 1134
1135 #if defined(OS_WIN) || defined(OS_LINUX) 1135 #if defined(OS_WIN) || defined(OS_LINUX)
1136 extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; 1136 extern const char kDisableInputImeAPI[] = "disable-input-ime-api";
1137 extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; 1137 extern const char kEnableInputImeAPI[] = "enable-input-ime-api";
1138 #endif 1138 #endif
1139 1139
1140 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ 1140 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
1141 defined(OS_WIN) 1141 defined(OS_WIN)
1142 extern const char kAppMenuIcon[] = "app-menu-icon"; 1142 extern const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
1143 extern const char kAppMenuIconOldBehavior[] = "old-behavior";
1144 extern const char kAppMenuIconPersistentOpenedState[] =
1145 "persistent-opened-state";
1146 extern const char kAppMenuIconPersistentClosedState[] =
1147 "persistent-closed-state";
1148 #endif 1143 #endif
1149 1144
1150 bool ExtensionsDisabled(const base::CommandLine& command_line) { 1145 bool ExtensionsDisabled(const base::CommandLine& command_line) {
1151 return command_line.HasSwitch(switches::kDisableExtensions) || 1146 return command_line.HasSwitch(switches::kDisableExtensions) ||
1152 command_line.HasSwitch(switches::kDisableExtensionsExcept); 1147 command_line.HasSwitch(switches::kDisableExtensionsExcept);
1153 } 1148 }
1154 1149
1155 bool MdFeedbackEnabled() { 1150 bool MdFeedbackEnabled() {
1156 return base::CommandLine::ForCurrentProcess()->HasSwitch( 1151 return base::CommandLine::ForCurrentProcess()->HasSwitch(
1157 ::switches::kEnableMaterialDesignFeedback); 1152 ::switches::kEnableMaterialDesignFeedback);
(...skipping 23 matching lines...) Expand all
1181 1176
1182 // ----------------------------------------------------------------------------- 1177 // -----------------------------------------------------------------------------
1183 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE. 1178 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE.
1184 // 1179 //
1185 // You were going to just dump your switches here, weren't you? Instead, please 1180 // You were going to just dump your switches here, weren't you? Instead, please
1186 // put them in alphabetical order above, or in order inside the appropriate 1181 // put them in alphabetical order above, or in order inside the appropriate
1187 // ifdef at the bottom. The order should match the header. 1182 // ifdef at the bottom. The order should match the header.
1188 // ----------------------------------------------------------------------------- 1183 // -----------------------------------------------------------------------------
1189 1184
1190 } // namespace switches 1185 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698