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

Side by Side Diff: chrome/browser/about_flags.h

Issue 16770002: Restart Chrome if per session flags have been specified on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to ToT and addressed Nico's comments. Created 7 years, 6 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
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 #ifndef CHROME_BROWSER_ABOUT_FLAGS_H_ 5 #ifndef CHROME_BROWSER_ABOUT_FLAGS_H_
6 #define CHROME_BROWSER_ABOUT_FLAGS_H_ 6 #define CHROME_BROWSER_ABOUT_FLAGS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // Returns the human readable description for the choice at |index|. 104 // Returns the human readable description for the choice at |index|.
105 string16 DescriptionForChoice(int index) const; 105 string16 DescriptionForChoice(int index) const;
106 }; 106 };
107 107
108 // Reads the Labs |prefs| (called "Labs" for historical reasons) and adds the 108 // Reads the Labs |prefs| (called "Labs" for historical reasons) and adds the
109 // commandline flags belonging to the active experiments to |command_line|. 109 // commandline flags belonging to the active experiments to |command_line|.
110 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, 110 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
111 CommandLine* command_line); 111 CommandLine* command_line);
112 112
113 // Compares a set of switches of the two provided command line objects and
114 // returns true if they are the same and false otherwise.
115 bool AreSwitchesIdenticalToCurrentCommandLine(
116 const CommandLine& new_cmdline, const CommandLine& active_cmdline);
117
113 // Differentiate between generic flags available on a per session base and flags 118 // Differentiate between generic flags available on a per session base and flags
114 // that influence the whole machine and can be said by the admin only. This flag 119 // that influence the whole machine and can be said by the admin only. This flag
115 // is relevant for ChromeOS for now only and dictates whether entries marked 120 // is relevant for ChromeOS for now only and dictates whether entries marked
116 // with the |kOsCrOSOwnerOnly| label should be enabled in the UI or not. 121 // with the |kOsCrOSOwnerOnly| label should be enabled in the UI or not.
117 enum FlagAccess { kGeneralAccessFlagsOnly, kOwnerAccessToFlags }; 122 enum FlagAccess { kGeneralAccessFlagsOnly, kOwnerAccessToFlags };
118 123
119 // Get the list of experiments. Experiments that are available on the current 124 // Get the list of experiments. Experiments that are available on the current
120 // platform are appended to |supported_experiments|; all other experiments are 125 // platform are appended to |supported_experiments|; all other experiments are
121 // appended to |unsupported_experiments|. 126 // appended to |unsupported_experiments|.
122 void GetFlagsExperimentsData(FlagsStorage* flags_storage, 127 void GetFlagsExperimentsData(FlagsStorage* flags_storage,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 168
164 // Separator used for multi values. Multi values are represented in prefs as 169 // Separator used for multi values. Multi values are represented in prefs as
165 // name-of-experiment + kMultiSeparator + selected_index. 170 // name-of-experiment + kMultiSeparator + selected_index.
166 extern const char kMultiSeparator[]; 171 extern const char kMultiSeparator[];
167 172
168 } // namespace testing 173 } // namespace testing
169 174
170 } // namespace about_flags 175 } // namespace about_flags
171 176
172 #endif // CHROME_BROWSER_ABOUT_FLAGS_H_ 177 #endif // CHROME_BROWSER_ABOUT_FLAGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/chromeos/login/login_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698