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

Side by Side Diff: chrome/browser/ui/webui/flags_ui.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 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/ui/webui/crashes_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/ui/webui/flags_ui.h" 5 #include "chrome/browser/ui/webui/flags_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 15 matching lines...) Expand all
26 #include "grit/browser_resources.h" 26 #include "grit/browser_resources.h"
27 #include "grit/chromium_strings.h" 27 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "grit/theme_resources.h" 29 #include "grit/theme_resources.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/layout.h" 31 #include "ui/base/layout.h"
32 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
33 33
34 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
35 #include "base/chromeos/chromeos_version.h" 35 #include "base/chromeos/chromeos_version.h"
36 #include "chrome/browser/chromeos/cros_settings.h"
37 #include "chrome/browser/chromeos/login/user_manager.h" 36 #include "chrome/browser/chromeos/login/user_manager.h"
37 #include "chrome/browser/chromeos/settings/cros_settings.h"
38 #endif 38 #endif
39 39
40 using content::WebContents; 40 using content::WebContents;
41 using content::WebUIMessageHandler; 41 using content::WebUIMessageHandler;
42 42
43 namespace { 43 namespace {
44 44
45 ChromeWebUIDataSource* CreateFlagsUIHTMLSource() { 45 ChromeWebUIDataSource* CreateFlagsUIHTMLSource() {
46 ChromeWebUIDataSource* source = 46 ChromeWebUIDataSource* source =
47 new ChromeWebUIDataSource(chrome::kChromeUIFlagsHost); 47 new ChromeWebUIDataSource(chrome::kChromeUIFlagsHost);
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // static 169 // static
170 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { 170 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
171 return ResourceBundle::GetSharedInstance(). 171 return ResourceBundle::GetSharedInstance().
172 LoadDataResourceBytes(IDR_FLAGS, ui::SCALE_FACTOR_100P); 172 LoadDataResourceBytes(IDR_FLAGS, ui::SCALE_FACTOR_100P);
173 } 173 }
174 174
175 // static 175 // static
176 void FlagsUI::RegisterPrefs(PrefService* prefs) { 176 void FlagsUI::RegisterPrefs(PrefService* prefs) {
177 prefs->RegisterListPref(prefs::kEnabledLabsExperiments); 177 prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
178 } 178 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/crashes_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698