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

Unified Diff: chrome/browser/supervised_user/supervised_user_theme.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_theme.cc
diff --git a/chrome/browser/managed_mode/managed_user_theme.cc b/chrome/browser/supervised_user/supervised_user_theme.cc
similarity index 63%
rename from chrome/browser/managed_mode/managed_user_theme.cc
rename to chrome/browser/supervised_user/supervised_user_theme.cc
index 42ee844052a9ec6df8dcc8c750cc6c786eaf3951..ee6686dfff8f5841bef19d5801f47e2d25c09d19 100644
--- a/chrome/browser/managed_mode/managed_user_theme.cc
+++ b/chrome/browser/supervised_user/supervised_user_theme.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/managed_mode/managed_user_theme.h"
+#include "chrome/browser/supervised_user/supervised_user_theme.h"
#include "chrome/browser/themes/theme_properties.h"
#include "grit/theme_resources.h"
@@ -11,14 +11,14 @@
namespace {
-const SkColor kDefaultColorFrameManagedUser = SkColorSetRGB(165, 197, 225);
-const SkColor kDefaultColorFrameManagedUserInactive =
+const SkColor kDefaultColorFrameSupervisedUser = SkColorSetRGB(165, 197, 225);
+const SkColor kDefaultColorFrameSupervisedUserInactive =
SkColorSetRGB(180, 225, 247);
-const SkColor kDefaultColorManagedUserLabelBackground =
+const SkColor kDefaultColorSupervisedUserLabelBackground =
SkColorSetRGB(108, 167, 210);
-// Map resource ids to the managed user resource ids.
-int MapToManagedUserResourceIds(int id) {
+// Map resource ids to the supervised user resource ids.
+int MapToSupervisedUserResourceIds(int id) {
switch (id) {
case IDR_THEME_FRAME:
#if defined(USE_ASH) && !defined(OS_CHROMEOS)
@@ -42,37 +42,37 @@ int MapToManagedUserResourceIds(int id) {
} // namespace
-ManagedUserTheme::ManagedUserTheme()
+SupervisedUserTheme::SupervisedUserTheme()
: CustomThemeSupplier(SUPERVISED_USER_THEME) {}
-ManagedUserTheme::~ManagedUserTheme() {}
+SupervisedUserTheme::~SupervisedUserTheme() {}
-bool ManagedUserTheme::GetColor(int id, SkColor* color) const {
+bool SupervisedUserTheme::GetColor(int id, SkColor* color) const {
switch (id) {
case ThemeProperties::COLOR_FRAME:
- *color = kDefaultColorFrameManagedUser;
+ *color = kDefaultColorFrameSupervisedUser;
return true;
case ThemeProperties::COLOR_FRAME_INACTIVE:
- *color = kDefaultColorFrameManagedUserInactive;
+ *color = kDefaultColorFrameSupervisedUserInactive;
return true;
case ThemeProperties::COLOR_SUPERVISED_USER_LABEL:
*color = SK_ColorWHITE;
return true;
case ThemeProperties::COLOR_SUPERVISED_USER_LABEL_BACKGROUND:
- *color = kDefaultColorManagedUserLabelBackground;
+ *color = kDefaultColorSupervisedUserLabelBackground;
return true;
}
return false;
}
-gfx::Image ManagedUserTheme::GetImageNamed(int id) {
+gfx::Image SupervisedUserTheme::GetImageNamed(int id) {
if (!HasCustomImage(id))
return gfx::Image();
- id = MapToManagedUserResourceIds(id);
+ id = MapToSupervisedUserResourceIds(id);
return ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
}
-bool ManagedUserTheme::HasCustomImage(int id) const {
- return id != MapToManagedUserResourceIds(id);
+bool SupervisedUserTheme::HasCustomImage(int id) const {
+ return id != MapToSupervisedUserResourceIds(id);
}
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_theme.h ('k') | chrome/browser/supervised_user/supervised_user_url_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698