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

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

Issue 505073002: Fix a bug where the resource manager displays Chrome Apps with non-human readable names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void DeleteLocalStorage(const GURL& site_url); 91 void DeleteLocalStorage(const GURL& site_url);
92 92
93 // Populates the single site edit view with the permissions and local storage 93 // Populates the single site edit view with the permissions and local storage
94 // usage for a given |site_url|. If |show_page| is true, it raises a new 94 // usage for a given |site_url|. If |show_page| is true, it raises a new
95 // single site edit view. 95 // single site edit view.
96 void GetInfoForOrigin(const GURL& site_url, bool show_page); 96 void GetInfoForOrigin(const GURL& site_url, bool show_page);
97 97
98 // Updates the page with the last settings used. 98 // Updates the page with the last settings used.
99 void Update(); 99 void Update();
100 100
101 // Returns the base URL for websites, or the app name for Chrome App URLs.
102 const std::string& GetReadableName(const GURL& site_url);
103
101 std::string last_setting_; 104 std::string last_setting_;
102 std::string last_filter_; 105 std::string last_filter_;
103 GURL last_site_; 106 GURL last_site_;
104 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_; 107 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_;
105 LocalStorageList local_storage_list_; 108 LocalStorageList local_storage_list_;
106 109
107 // Observer to watch for content settings changes. 110 // Observer to watch for content settings changes.
108 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 111 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
109 112
110 base::WeakPtrFactory<WebsiteSettingsHandler> weak_ptr_factory_; 113 base::WeakPtrFactory<WebsiteSettingsHandler> weak_ptr_factory_;
111 114
112 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsHandler); 115 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsHandler);
113 }; 116 };
114 117
115 } // namespace options 118 } // namespace options
116 119
117 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_ 120 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_WEBSITE_SETTINGS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698