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

Side by Side Diff: chrome/browser/ui/options/options_util.h

Issue 7171018: User Settings on CrOS now shows the managed banner for enrolled devices. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_UI_OPTIONS_OPTIONS_UTIL_H_ 5 #ifndef CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_
6 #define CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_ 6 #define CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 10
11 // An identifier for an Options Tab page. These are treated as indices into 11 // An identifier for an Options Tab page. These are treated as indices into
12 // the list of available tabs to be displayed. PAGE_DEFAULT means select the 12 // the list of available tabs to be displayed. PAGE_DEFAULT means select the
13 // last tab viewed when the Options window was opened, or PAGE_GENERAL if the 13 // last tab viewed when the Options window was opened, or PAGE_GENERAL if the
14 // Options was never opened. 14 // Options was never opened.
15 enum OptionsPage { 15 enum OptionsPage {
16 OPTIONS_PAGE_DEFAULT = -1, 16 OPTIONS_PAGE_DEFAULT = -1,
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 OPTIONS_PAGE_SYSTEM, 18 OPTIONS_PAGE_SYSTEM,
19 OPTIONS_PAGE_INTERNET, 19 OPTIONS_PAGE_INTERNET,
20 OPTIONS_PAGE_ACCOUNTS,
Mattias Nissler (ping if slow) 2011/06/15 15:02:59 Why do you remove this? I thought we need it to pe
pastarmovj 2011/06/15 15:57:07 This is only needed for the OptionsManagedBannerHa
21 #endif 20 #endif
22 OPTIONS_PAGE_GENERAL, 21 OPTIONS_PAGE_GENERAL,
23 OPTIONS_PAGE_CONTENT, 22 OPTIONS_PAGE_CONTENT,
24 OPTIONS_PAGE_ADVANCED, 23 OPTIONS_PAGE_ADVANCED,
25 OPTIONS_PAGE_COUNT 24 OPTIONS_PAGE_COUNT
26 }; 25 };
27 26
28 class OptionsUtil { 27 class OptionsUtil {
29 public: 28 public:
30 // Try to make the the crash stats consent and the metrics upload 29 // Try to make the the crash stats consent and the metrics upload
31 // permission match |enabled|, returns the actual enabled setting. 30 // permission match |enabled|, returns the actual enabled setting.
32 static bool ResolveMetricsReportingEnabled(bool enabled); 31 static bool ResolveMetricsReportingEnabled(bool enabled);
33 32
34 private: 33 private:
35 DISALLOW_IMPLICIT_CONSTRUCTORS(OptionsUtil); 34 DISALLOW_IMPLICIT_CONSTRUCTORS(OptionsUtil);
36 }; 35 };
37 36
38 #endif // CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_ 37 #endif // CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698