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

Side by Side Diff: chrome/browser/themes/theme_service.cc

Issue 12315139: Sort out build dependencies for LinuxUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment Created 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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 "chrome/browser/themes/theme_service.h" 5 #include "chrome/browser/themes/theme_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/sequenced_task_runner.h" 10 #include "base/sequenced_task_runner.h"
(...skipping 14 matching lines...) Expand all
25 #include "grit/ui_resources.h" 25 #include "grit/ui_resources.h"
26 #include "ui/base/layout.h" 26 #include "ui/base/layout.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/gfx/image/image_skia.h" 28 #include "ui/gfx/image/image_skia.h"
29 29
30 #if defined(OS_WIN) 30 #if defined(OS_WIN)
31 #include "ui/base/win/shell.h" 31 #include "ui/base/win/shell.h"
32 #endif 32 #endif
33 33
34 #if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) 34 #if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
35 #include "ui/base/linux_ui.h" 35 #include "ui/linux_ui/linux_ui.h"
36 #endif 36 #endif
37 37
38 using content::BrowserThread; 38 using content::BrowserThread;
39 using content::UserMetricsAction; 39 using content::UserMetricsAction;
40 using extensions::Extension; 40 using extensions::Extension;
41 using ui::ResourceBundle; 41 using ui::ResourceBundle;
42 42
43 typedef ThemeProperties Properties; 43 typedef ThemeProperties Properties;
44 44
45 // The default theme if we haven't installed a theme yet or if we've clicked 45 // The default theme if we haven't installed a theme yet or if we've clicked
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 void ThemeService::OnInfobarDestroyed() { 384 void ThemeService::OnInfobarDestroyed() {
385 number_of_infobars_--; 385 number_of_infobars_--;
386 386
387 if (number_of_infobars_ == 0) 387 if (number_of_infobars_ == 0)
388 RemoveUnusedThemes(); 388 RemoveUnusedThemes();
389 } 389 }
390 390
391 ThemeSyncableService* ThemeService::GetThemeSyncableService() const { 391 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
392 return theme_syncable_service_.get(); 392 return theme_syncable_service_.get();
393 } 393 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698