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

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

Issue 582983002: Fix a bug where Guest Profiles in CrOS could cause crashes when collecting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_WEBSITE_SETTINGS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void Update(); 121 void Update();
122 122
123 // Gets the default setting in string form. If |provider_id| is not NULL, the 123 // Gets the default setting in string form. If |provider_id| is not NULL, the
124 // id of the provider which provided the default setting is assigned to it. 124 // id of the provider which provided the default setting is assigned to it.
125 std::string GetSettingDefaultFromModel(ContentSettingsType type, 125 std::string GetSettingDefaultFromModel(ContentSettingsType type,
126 std::string* provider_id); 126 std::string* provider_id);
127 127
128 // Returns the base URL for websites, or the app name for Chrome App URLs. 128 // Returns the base URL for websites, or the app name for Chrome App URLs.
129 const std::string& GetReadableName(const GURL& site_url); 129 const std::string& GetReadableName(const GURL& site_url);
130 130
131 Profile* GetProfile();
132
131 std::string last_setting_; 133 std::string last_setting_;
132 std::string last_filter_; 134 std::string last_filter_;
133 GURL last_site_; 135 GURL last_site_;
134 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_; 136 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_;
135 LocalStorageList local_storage_list_; 137 LocalStorageList local_storage_list_;
136 138
137 // Observer to watch for content settings changes. 139 // Observer to watch for content settings changes.
138 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 140 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
139 141
140 // Subscription to watch for power consumption updates. 142 // Subscription to watch for power consumption updates.
141 scoped_ptr<power::OriginPowerMap::Subscription> subscription_; 143 scoped_ptr<power::OriginPowerMap::Subscription> subscription_;
142 144
143 base::WeakPtrFactory<WebsiteSettingsHandler> weak_ptr_factory_; 145 base::WeakPtrFactory<WebsiteSettingsHandler> weak_ptr_factory_;
144 146
145 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsHandler); 147 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsHandler);
146 }; 148 };
147 149
148 } // namespace options 150 } // namespace options
149 151
150 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_ 152 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698