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

Side by Side Diff: ui/native_theme/native_theme_android.cc

Issue 139623002: Tweaks to get views compiling with mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mismatch Created 6 years, 11 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
« no previous file with comments | « no previous file | ui/views/corewm/transient_window_stacking_client.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 "ui/native_theme/native_theme_android.h" 5 #include "ui/native_theme/native_theme_android.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 #if !defined(USE_AURA)
12 // static 13 // static
13 NativeTheme* NativeTheme::instance() { 14 NativeTheme* NativeTheme::instance() {
14 return NativeThemeAndroid::instance(); 15 return NativeThemeAndroid::instance();
15 } 16 }
17 #endif
16 18
17 // static 19 // static
18 NativeThemeAndroid* NativeThemeAndroid::instance() { 20 NativeThemeAndroid* NativeThemeAndroid::instance() {
19 CR_DEFINE_STATIC_LOCAL(NativeThemeAndroid, s_native_theme, ()); 21 CR_DEFINE_STATIC_LOCAL(NativeThemeAndroid, s_native_theme, ());
20 return &s_native_theme; 22 return &s_native_theme;
21 } 23 }
22 24
23 SkColor NativeThemeAndroid::GetSystemColor(ColorId color_id) const { 25 SkColor NativeThemeAndroid::GetSystemColor(ColorId color_id) const {
24 NOTIMPLEMENTED(); 26 NOTIMPLEMENTED();
25 return SK_ColorBLACK; 27 return SK_ColorBLACK;
26 } 28 }
27 29
28 NativeThemeAndroid::NativeThemeAndroid() { 30 NativeThemeAndroid::NativeThemeAndroid() {
29 } 31 }
30 32
31 NativeThemeAndroid::~NativeThemeAndroid() { 33 NativeThemeAndroid::~NativeThemeAndroid() {
32 } 34 }
33 35
34 } // namespace ui 36 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/views/corewm/transient_window_stacking_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698