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

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

Issue 2893693002: Remove NOTIFICATION_EXTENSION_ENABLED. (Closed)
Patch Set: sync + address comments Created 3 years, 6 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
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 #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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 typedef std::map<int, NSGradient*> NSGradientMap; 294 typedef std::map<int, NSGradient*> NSGradientMap;
295 mutable NSGradientMap nsgradient_cache_; 295 mutable NSGradientMap nsgradient_cache_;
296 #endif 296 #endif
297 297
298 ui::ResourceBundle& rb_; 298 ui::ResourceBundle& rb_;
299 Profile* profile_; 299 Profile* profile_;
300 300
301 scoped_refptr<CustomThemeSupplier> theme_supplier_; 301 scoped_refptr<CustomThemeSupplier> theme_supplier_;
302 302
303 // The id of the theme extension which has just been installed but has not
304 // been loaded yet. The theme extension with |installed_pending_load_id_| may
305 // never be loaded if the install is due to updating a disabled theme.
306 // |pending_install_id_| should be set to |kDefaultThemeID| if there are no
307 // recently installed theme extensions
308 std::string installed_pending_load_id_;
309
310 // The number of infobars currently displayed. 303 // The number of infobars currently displayed.
311 int number_of_infobars_; 304 int number_of_infobars_;
312 305
313 // A cache of already-computed values for COLOR_TOOLBAR_TOP_SEPARATOR, which 306 // A cache of already-computed values for COLOR_TOOLBAR_TOP_SEPARATOR, which
314 // can be expensive to compute. 307 // can be expensive to compute.
315 mutable SeparatorColorCache separator_color_cache_; 308 mutable SeparatorColorCache separator_color_cache_;
316 309
317 content::NotificationRegistrar registrar_; 310 content::NotificationRegistrar registrar_;
318 311
319 std::unique_ptr<ThemeSyncableService> theme_syncable_service_; 312 std::unique_ptr<ThemeSyncableService> theme_syncable_service_;
320 313
321 #if BUILDFLAG(ENABLE_EXTENSIONS) 314 #if BUILDFLAG(ENABLE_EXTENSIONS)
322 class ThemeObserver; 315 class ThemeObserver;
323 std::unique_ptr<ThemeObserver> theme_observer_; 316 std::unique_ptr<ThemeObserver> theme_observer_;
324 #endif 317 #endif
325 318
326 BrowserThemeProvider original_theme_provider_; 319 BrowserThemeProvider original_theme_provider_;
327 BrowserThemeProvider incognito_theme_provider_; 320 BrowserThemeProvider incognito_theme_provider_;
328 321
329 SEQUENCE_CHECKER(sequence_checker_); 322 SEQUENCE_CHECKER(sequence_checker_);
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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698