| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_ |
| 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_ | 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 295 |
| 296 typedef std::map<int, NSGradient*> NSGradientMap; | 296 typedef std::map<int, NSGradient*> NSGradientMap; |
| 297 mutable NSGradientMap nsgradient_cache_; | 297 mutable NSGradientMap nsgradient_cache_; |
| 298 #endif | 298 #endif |
| 299 | 299 |
| 300 ui::ResourceBundle& rb_; | 300 ui::ResourceBundle& rb_; |
| 301 Profile* profile_; | 301 Profile* profile_; |
| 302 | 302 |
| 303 scoped_refptr<CustomThemeSupplier> theme_supplier_; | 303 scoped_refptr<CustomThemeSupplier> theme_supplier_; |
| 304 | 304 |
| 305 // The id of the theme extension which has just been installed but has not | |
| 306 // been loaded yet. The theme extension with |installed_pending_load_id_| may | |
| 307 // never be loaded if the install is due to updating a disabled theme. | |
| 308 // |pending_install_id_| should be set to |kDefaultThemeID| if there are no | |
| 309 // recently installed theme extensions | |
| 310 std::string installed_pending_load_id_; | |
| 311 | |
| 312 // The number of infobars currently displayed. | 305 // The number of infobars currently displayed. |
| 313 int number_of_infobars_; | 306 int number_of_infobars_; |
| 314 | 307 |
| 315 // A cache of already-computed values for COLOR_TOOLBAR_TOP_SEPARATOR, which | 308 // A cache of already-computed values for COLOR_TOOLBAR_TOP_SEPARATOR, which |
| 316 // can be expensive to compute. | 309 // can be expensive to compute. |
| 317 mutable SeparatorColorCache separator_color_cache_; | 310 mutable SeparatorColorCache separator_color_cache_; |
| 318 | 311 |
| 319 content::NotificationRegistrar registrar_; | 312 content::NotificationRegistrar registrar_; |
| 320 | 313 |
| 321 std::unique_ptr<ThemeSyncableService> theme_syncable_service_; | 314 std::unique_ptr<ThemeSyncableService> theme_syncable_service_; |
| 322 | 315 |
| 323 #if BUILDFLAG(ENABLE_EXTENSIONS) | 316 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 324 class ThemeObserver; | 317 class ThemeObserver; |
| 325 std::unique_ptr<ThemeObserver> theme_observer_; | 318 std::unique_ptr<ThemeObserver> theme_observer_; |
| 326 #endif | 319 #endif |
| 327 | 320 |
| 328 BrowserThemeProvider original_theme_provider_; | 321 BrowserThemeProvider original_theme_provider_; |
| 329 BrowserThemeProvider incognito_theme_provider_; | 322 BrowserThemeProvider incognito_theme_provider_; |
| 330 | 323 |
| 331 base::WeakPtrFactory<ThemeService> weak_ptr_factory_; | 324 base::WeakPtrFactory<ThemeService> weak_ptr_factory_; |
| 332 | 325 |
| 333 DISALLOW_COPY_AND_ASSIGN(ThemeService); | 326 DISALLOW_COPY_AND_ASSIGN(ThemeService); |
| 334 }; | 327 }; |
| 335 | 328 |
| 336 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ | 329 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ |
| OLD | NEW |