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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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
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/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
26 #include "extensions/browser/extension_prefs.h" 26 #include "extensions/browser/extension_prefs.h"
27 #include "extensions/browser/extension_registry.h" 27 #include "extensions/browser/extension_registry.h"
28 #include "extensions/browser/extension_system.h" 28 #include "extensions/browser/extension_system.h"
29 #include "extensions/browser/uninstall_reason.h" 29 #include "extensions/browser/uninstall_reason.h"
30 #include "extensions/common/extension.h" 30 #include "extensions/common/extension.h"
31 #include "extensions/common/extension_set.h" 31 #include "extensions/common/extension_set.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 #include "grit/ui_resources.h"
34 #include "ui/base/layout.h" 33 #include "ui/base/layout.h"
35 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/image/image_skia.h" 35 #include "ui/gfx/image/image_skia.h"
36 #include "ui/resources/grit/ui_resources.h"
37 37
38 #if defined(OS_WIN) 38 #if defined(OS_WIN)
39 #include "ui/base/win/shell.h" 39 #include "ui/base/win/shell.h"
40 #endif 40 #endif
41 41
42 using base::UserMetricsAction; 42 using base::UserMetricsAction;
43 using content::BrowserThread; 43 using content::BrowserThread;
44 using extensions::Extension; 44 using extensions::Extension;
45 using extensions::UnloadedExtensionInfo; 45 using extensions::UnloadedExtensionInfo;
46 using ui::ResourceBundle; 46 using ui::ResourceBundle;
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 void ThemeService::OnInfobarDestroyed() { 604 void ThemeService::OnInfobarDestroyed() {
605 number_of_infobars_--; 605 number_of_infobars_--;
606 606
607 if (number_of_infobars_ == 0) 607 if (number_of_infobars_ == 0)
608 RemoveUnusedThemes(false); 608 RemoveUnusedThemes(false);
609 } 609 }
610 610
611 ThemeSyncableService* ThemeService::GetThemeSyncableService() const { 611 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
612 return theme_syncable_service_.get(); 612 return theme_syncable_service_.get();
613 } 613 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_properties.cc ('k') | chrome/browser/ui/android/navigation_popup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698