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

Side by Side Diff: chrome/browser/themes/theme_service_aurax11.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/themes/theme_service_aurax11.h" 5 #include "chrome/browser/themes/theme_service_aurax11.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h"
8 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/themes/custom_theme_supplier.h" 11 #include "chrome/browser/themes/custom_theme_supplier.h"
11 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
12 #include "ui/gfx/image/image.h" 13 #include "ui/gfx/image/image.h"
13 #include "ui/native_theme/native_theme_aura.h" 14 #include "ui/native_theme/native_theme_aura.h"
14 #include "ui/views/linux_ui/linux_ui.h" 15 #include "ui/views/linux_ui/linux_ui.h"
15 16
16 namespace { 17 namespace {
17 18
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 94
94 bool ThemeServiceAuraX11::UsingDefaultTheme() const { 95 bool ThemeServiceAuraX11::UsingDefaultTheme() const {
95 return ThemeService::UsingDefaultTheme() && !UsingSystemTheme(); 96 return ThemeService::UsingDefaultTheme() && !UsingSystemTheme();
96 } 97 }
97 98
98 bool ThemeServiceAuraX11::UsingSystemTheme() const { 99 bool ThemeServiceAuraX11::UsingSystemTheme() const {
99 const CustomThemeSupplier* theme_supplier = get_theme_supplier(); 100 const CustomThemeSupplier* theme_supplier = get_theme_supplier();
100 return theme_supplier && 101 return theme_supplier &&
101 theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11; 102 theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11;
102 } 103 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.h ('k') | chrome/browser/themes/theme_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698