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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_theme.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised_user/supervised_user_theme.h" 5 #include "chrome/browser/supervised_user/supervised_user_theme.h"
6 6
7 #include "build/build_config.h"
7 #include "chrome/browser/themes/theme_properties.h" 8 #include "chrome/browser/themes/theme_properties.h"
8 #include "grit/theme_resources.h" 9 #include "grit/theme_resources.h"
9 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/image/image.h" 11 #include "ui/gfx/image/image.h"
11 12
12 namespace { 13 namespace {
13 14
14 const SkColor kDefaultColorFrameSupervisedUser = SkColorSetRGB(165, 197, 225); 15 const SkColor kDefaultColorFrameSupervisedUser = SkColorSetRGB(165, 197, 225);
15 const SkColor kDefaultColorFrameSupervisedUserInactive = 16 const SkColor kDefaultColorFrameSupervisedUserInactive =
16 SkColorSetRGB(180, 225, 247); 17 SkColorSetRGB(180, 225, 247);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 if (!HasCustomImage(id)) 70 if (!HasCustomImage(id))
70 return gfx::Image(); 71 return gfx::Image();
71 72
72 id = MapToSupervisedUserResourceIds(id); 73 id = MapToSupervisedUserResourceIds(id);
73 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(id); 74 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
74 } 75 }
75 76
76 bool SupervisedUserTheme::HasCustomImage(int id) const { 77 bool SupervisedUserTheme::HasCustomImage(int id) const {
77 return id != MapToSupervisedUserResourceIds(id); 78 return id != MapToSupervisedUserResourceIds(id);
78 } 79 }
OLDNEW
« 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