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

Side by Side Diff: chrome/browser/ui/webui/options/font_settings_handler.h

Issue 1397903004: options: Fix async font fetching crash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/font_settings_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h"
9 #include "base/prefs/pref_member.h" 11 #include "base/prefs/pref_member.h"
10 #include "base/scoped_observer.h" 12 #include "base/scoped_observer.h"
11 #include "chrome/browser/ui/webui/options/options_ui.h" 13 #include "chrome/browser/ui/webui/options/options_ui.h"
12 #include "extensions/browser/extension_registry_observer.h" 14 #include "extensions/browser/extension_registry_observer.h"
13 15
14 namespace base { 16 namespace base {
15 class ListValue; 17 class ListValue;
16 } 18 }
17 19
18 namespace extensions { 20 namespace extensions {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 StringPrefMember fixed_font_; 75 StringPrefMember fixed_font_;
74 StringPrefMember font_encoding_; 76 StringPrefMember font_encoding_;
75 IntegerPrefMember default_font_size_; 77 IntegerPrefMember default_font_size_;
76 IntegerPrefMember default_fixed_font_size_; 78 IntegerPrefMember default_fixed_font_size_;
77 IntegerPrefMember minimum_font_size_; 79 IntegerPrefMember minimum_font_size_;
78 80
79 ScopedObserver<extensions::ExtensionRegistry, 81 ScopedObserver<extensions::ExtensionRegistry,
80 extensions::ExtensionRegistryObserver> 82 extensions::ExtensionRegistryObserver>
81 extension_registry_observer_; 83 extension_registry_observer_;
82 84
85 base::WeakPtrFactory<FontSettingsHandler> weak_ptr_factory_;
86
83 DISALLOW_COPY_AND_ASSIGN(FontSettingsHandler); 87 DISALLOW_COPY_AND_ASSIGN(FontSettingsHandler);
84 }; 88 };
85 89
86 } // namespace options 90 } // namespace options
87 91
88 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_ 92 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/font_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698