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

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

Issue 2732963005: Views/Permissions: Use shorter strings for site setting drop downs. (Closed)
Patch Set: Change all references to |info| in the constructor to references to |permission_| to be consistent. Created 3 years, 9 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 | « chrome/browser/ui/website_settings/permission_menu_model.cc ('k') | no next file » | 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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // Returns the UI string for the given permission |type|. 139 // Returns the UI string for the given permission |type|.
140 static base::string16 PermissionTypeToUIString(ContentSettingsType type); 140 static base::string16 PermissionTypeToUIString(ContentSettingsType type);
141 141
142 // Returns the UI string for the given permission |value|, used in the 142 // Returns the UI string for the given permission |value|, used in the
143 // permission-changing menu. Generally this will be a verb in the imperative 143 // permission-changing menu. Generally this will be a verb in the imperative
144 // form, e.g. "ask", "allow", "block". 144 // form, e.g. "ask", "allow", "block".
145 static base::string16 PermissionValueToUIString(ContentSetting value); 145 static base::string16 PermissionValueToUIString(ContentSetting value);
146 146
147 // Returns the UI string describing the action taken for a permission, 147 // Returns the UI string describing the action taken for a permission,
148 // including why that action was taken. E.g. "Allowed by you", 148 // including why that action was taken. E.g. "Allowed by you",
149 // "Blocked by default". 149 // "Blocked by default". If |setting| is default, specify the actual default
150 // setting using |default_setting|.
150 static base::string16 PermissionActionToUIString( 151 static base::string16 PermissionActionToUIString(
151 Profile* profile, 152 Profile* profile,
152 ContentSettingsType type, 153 ContentSettingsType type,
153 ContentSetting setting, 154 ContentSetting setting,
154 ContentSetting default_setting, 155 ContentSetting default_setting,
155 content_settings::SettingSource source); 156 content_settings::SettingSource source);
156 157
157 // Returns the icon resource ID for the given permission |type| and |setting|. 158 // Returns the icon resource ID for the given permission |type| and |setting|.
158 static int GetPermissionIconID(ContentSettingsType type, 159 static int GetPermissionIconID(ContentSettingsType type,
159 ContentSetting setting); 160 ContentSetting setting);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 196
196 // Sets site identity information. 197 // Sets site identity information.
197 virtual void SetIdentityInfo(const IdentityInfo& identity_info) = 0; 198 virtual void SetIdentityInfo(const IdentityInfo& identity_info) = 0;
198 }; 199 };
199 200
200 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList; 201 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList;
201 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList; 202 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList;
202 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList; 203 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList;
203 204
204 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 205 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/permission_menu_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698