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/themes/theme_service.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_split.h" 7 #include "base/string_split.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/themes/browser_theme_pack.h" 12 #include "chrome/browser/themes/browser_theme_pack.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "content/browser/user_metrics.h" 16 #include "content/browser/user_metrics.h"
17 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "grit/theme_resources_standard.h" 19 #include "grit/theme_resources_standard.h"
20 #include "grit/ui_resources.h" 20 #include "grit/ui_resources.h"
21 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
22 22
23 #if defined(OS_WIN) && !defined(USE_AURA) 23 #if defined(OS_WIN) && !defined(USE_AURA)
24 #include "views/widget/native_widget_win.h" 24 #include "ui/views/widget/native_widget_win.h"
25 #endif 25 #endif
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 28
29 // Strings used in alignment properties. 29 // Strings used in alignment properties.
30 const char* ThemeService::kAlignmentTop = "top"; 30 const char* ThemeService::kAlignmentTop = "top";
31 const char* ThemeService::kAlignmentBottom = "bottom"; 31 const char* ThemeService::kAlignmentBottom = "bottom";
32 const char* ThemeService::kAlignmentLeft = "left"; 32 const char* ThemeService::kAlignmentLeft = "left";
33 const char* ThemeService::kAlignmentRight = "right"; 33 const char* ThemeService::kAlignmentRight = "right";
34 34
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 void ThemeService::OnInfobarDisplayed() { 664 void ThemeService::OnInfobarDisplayed() {
665 number_of_infobars_++; 665 number_of_infobars_++;
666 } 666 }
667 667
668 void ThemeService::OnInfobarDestroyed() { 668 void ThemeService::OnInfobarDestroyed() {
669 number_of_infobars_--; 669 number_of_infobars_--;
670 670
671 if (number_of_infobars_ == 0) 671 if (number_of_infobars_ == 0)
672 RemoveUnusedThemes(); 672 RemoveUnusedThemes();
673 } 673 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_first_render_watcher_browsertest.cc ('k') | chrome/browser/ui/browser_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698