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

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

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 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 #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 12 matching lines...) Expand all
23 #include "content/public/browser/web_ui_message_handler.h" 23 #include "content/public/browser/web_ui_message_handler.h"
24 #include "grit/browser_resources.h" 24 #include "grit/browser_resources.h"
25 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources_standard.h" 27 #include "grit/theme_resources_standard.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
33 #include "base/chromeos/chromeos_version.h"
33 #include "chrome/browser/chromeos/cros_settings.h" 34 #include "chrome/browser/chromeos/cros_settings.h"
34 #include "chrome/browser/chromeos/login/user_manager.h" 35 #include "chrome/browser/chromeos/login/user_manager.h"
35 #include "chrome/browser/chromeos/system/runtime_environment.h"
36 #endif 36 #endif
37 37
38 using content::WebContents; 38 using content::WebContents;
39 using content::WebUIMessageHandler; 39 using content::WebUIMessageHandler;
40 40
41 namespace { 41 namespace {
42 42
43 ChromeWebUIDataSource* CreateFlagsUIHTMLSource() { 43 ChromeWebUIDataSource* CreateFlagsUIHTMLSource() {
44 ChromeWebUIDataSource* source = 44 ChromeWebUIDataSource* source =
45 new ChromeWebUIDataSource(chrome::kChromeUIFlagsHost); 45 new ChromeWebUIDataSource(chrome::kChromeUIFlagsHost);
(...skipping 16 matching lines...) Expand all
62 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); 62 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
63 source->AddString("ownerUserId", UTF8ToUTF16(owner)); 63 source->AddString("ownerUserId", UTF8ToUTF16(owner));
64 #endif 64 #endif
65 65
66 source->set_json_path("strings.js"); 66 source->set_json_path("strings.js");
67 source->add_resource_path("flags.js", IDR_FLAGS_JS); 67 source->add_resource_path("flags.js", IDR_FLAGS_JS);
68 68
69 int idr = IDR_FLAGS_HTML; 69 int idr = IDR_FLAGS_HTML;
70 #if defined (OS_CHROMEOS) 70 #if defined (OS_CHROMEOS)
71 if (!chromeos::UserManager::Get()->IsCurrentUserOwner() && 71 if (!chromeos::UserManager::Get()->IsCurrentUserOwner() &&
72 chromeos::system::runtime_environment::IsRunningOnChromeOS()) 72 base::chromeos::IsRunningOnChromeOS())
73 idr = IDR_FLAGS_HTML_WARNING; 73 idr = IDR_FLAGS_HTML_WARNING;
74 #endif 74 #endif
75 source->set_default_resource(idr); 75 source->set_default_resource(idr);
76 return source; 76 return source;
77 } 77 }
78 78
79 //////////////////////////////////////////////////////////////////////////////// 79 ////////////////////////////////////////////////////////////////////////////////
80 // 80 //
81 // FlagsDOMHandler 81 // FlagsDOMHandler
82 // 82 //
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // static 167 // static
168 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { 168 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
169 return ResourceBundle::GetSharedInstance(). 169 return ResourceBundle::GetSharedInstance().
170 LoadDataResourceBytes(IDR_FLAGS); 170 LoadDataResourceBytes(IDR_FLAGS);
171 } 171 }
172 172
173 // static 173 // static
174 void FlagsUI::RegisterPrefs(PrefService* prefs) { 174 void FlagsUI::RegisterPrefs(PrefService* prefs) {
175 prefs->RegisterListPref(prefs::kEnabledLabsExperiments); 175 prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
176 } 176 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698