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

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

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed touchui Created 9 years, 8 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) 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/metrics/user_metrics.h" 11 #include "chrome/browser/metrics/user_metrics.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/themes/browser_theme_pack.h" 13 #include "chrome/browser/themes/browser_theme_pack.h"
14 #include "chrome/common/chrome_constants.h" 14 #include "chrome/common/chrome_constants.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "content/common/notification_service.h" 16 #include "content/common/notification_service.h"
17 #include "content/common/notification_type.h" 17 #include "content/common/notification_type.h"
18 #include "grit/app_resources.h" 18 #include "grit/app_resources.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "grit/theme_resources_standard.h"
20 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
21 22
22 #if defined(OS_WIN) 23 #if defined(OS_WIN)
23 #include "views/widget/widget_win.h" 24 #include "views/widget/widget_win.h"
24 #endif 25 #endif
25 26
26 // Strings used in alignment properties. 27 // Strings used in alignment properties.
27 const char* ThemeService::kAlignmentTop = "top"; 28 const char* ThemeService::kAlignmentTop = "top";
28 const char* ThemeService::kAlignmentBottom = "bottom"; 29 const char* ThemeService::kAlignmentBottom = "bottom";
29 const char* ThemeService::kAlignmentLeft = "left"; 30 const char* ThemeService::kAlignmentLeft = "left";
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 void ThemeService::OnInfobarDisplayed() { 648 void ThemeService::OnInfobarDisplayed() {
648 number_of_infobars_++; 649 number_of_infobars_++;
649 } 650 }
650 651
651 void ThemeService::OnInfobarDestroyed() { 652 void ThemeService::OnInfobarDestroyed() {
652 number_of_infobars_--; 653 number_of_infobars_--;
653 654
654 if (number_of_infobars_ == 0) 655 if (number_of_infobars_ == 0)
655 RemoveUnusedThemes(); 656 RemoveUnusedThemes();
656 } 657 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698