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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.h

Issue 2185213002: Display USB devices in the site settings popup on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replaced code to free chosen objects. Created 4 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 (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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6, 88 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6,
89 // No longer used; indicated a UI viewer for SCTs. 89 // No longer used; indicated a UI viewer for SCTs.
90 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7, 90 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7,
91 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8, 91 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8,
92 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9, 92 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9,
93 WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10, 93 WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10,
94 WEBSITE_SETTINGS_COUNT 94 WEBSITE_SETTINGS_COUNT
95 }; 95 };
96 96
97 struct ChooserUIInfo { 97 struct ChooserUIInfo {
98 ContentSettingsType content_settings_type;
98 ChooserContextBase* (*get_context)(Profile*); 99 ChooserContextBase* (*get_context)(Profile*);
99 int blocked_icon_id; 100 int blocked_icon_id;
100 int allowed_icon_id; 101 int allowed_icon_id;
101 int label_string_id; 102 int label_string_id;
102 int delete_tooltip_string_id; 103 int delete_tooltip_string_id;
103 const char* ui_name_key; 104 const char* ui_name_key;
104 }; 105 };
105 106
106 // Creates a WebsiteSettings for the passed |url| using the given |ssl| status 107 // Creates a WebsiteSettings for the passed |url| using the given |ssl| status
107 // object to determine the status of the site's connection. The 108 // object to determine the status of the site's connection. The
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_; 236 ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_;
236 237
237 bool did_revoke_user_ssl_decisions_; 238 bool did_revoke_user_ssl_decisions_;
238 239
239 Profile* profile_; 240 Profile* profile_;
240 241
241 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); 242 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
242 }; 243 };
243 244
244 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 245 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/website_settings_popup_android.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698