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

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

Issue 790123003: Re-land: Fix Website Settings crash with Plugins ASK setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "chrome/grit/chromium_strings.h" 7 #include "chrome/grit/chromium_strings.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "grit/theme_resources.h" 9 #include "grit/theme_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/image/image.h" 12 #include "ui/gfx/image/image.h"
13 13
14 namespace { 14 namespace {
15 15
16 const int kInvalidResourceID = -1; 16 const int kInvalidResourceID = -1;
17 17
18 // The resource id's for the strings that are displayed on the permissions 18 // The resource id's for the strings that are displayed on the permissions
19 // button if the permission setting is managed by policy. 19 // button if the permission setting is managed by policy.
20 const int kPermissionButtonTextIDPolicyManaged[] = { 20 const int kPermissionButtonTextIDPolicyManaged[] = {
21 kInvalidResourceID, 21 kInvalidResourceID,
22 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY, 22 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,
23 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY, 23 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,
24 kInvalidResourceID, 24 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_POLICY,
25 kInvalidResourceID, 25 kInvalidResourceID,
26 kInvalidResourceID}; 26 kInvalidResourceID};
27 static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) == 27 static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) ==
28 CONTENT_SETTING_NUM_SETTINGS, 28 CONTENT_SETTING_NUM_SETTINGS,
29 "kPermissionButtonTextIDPolicyManaged array size is incorrect"); 29 "kPermissionButtonTextIDPolicyManaged array size is incorrect");
30 30
31 // The resource id's for the strings that are displayed on the permissions 31 // The resource id's for the strings that are displayed on the permissions
32 // button if the permission setting is managed by an extension. 32 // button if the permission setting is managed by an extension.
33 const int kPermissionButtonTextIDExtensionManaged[] = { 33 const int kPermissionButtonTextIDExtensionManaged[] = {
34 kInvalidResourceID, 34 kInvalidResourceID,
35 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION, 35 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION,
36 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION, 36 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION,
37 kInvalidResourceID, 37 kInvalidResourceID,
38 kInvalidResourceID, 38 kInvalidResourceID,
39 kInvalidResourceID}; 39 kInvalidResourceID};
40 static_assert(arraysize(kPermissionButtonTextIDExtensionManaged) == 40 static_assert(arraysize(kPermissionButtonTextIDExtensionManaged) ==
41 CONTENT_SETTING_NUM_SETTINGS, 41 CONTENT_SETTING_NUM_SETTINGS,
42 "kPermissionButtonTextIDExtensionManaged array size is " 42 "kPermissionButtonTextIDExtensionManaged array size is "
43 "incorrect"); 43 "incorrect");
44 44
45 // The resource id's for the strings that are displayed on the permissions 45 // The resource id's for the strings that are displayed on the permissions
46 // button if the permission setting is managed by the user. 46 // button if the permission setting is managed by the user.
47 const int kPermissionButtonTextIDUserManaged[] = { 47 const int kPermissionButtonTextIDUserManaged[] = {
48 kInvalidResourceID, 48 kInvalidResourceID,
49 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER, 49 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,
50 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER, 50 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,
51 kInvalidResourceID, 51 IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_USER,
52 kInvalidResourceID, 52 kInvalidResourceID,
53 kInvalidResourceID}; 53 kInvalidResourceID};
54 static_assert(arraysize(kPermissionButtonTextIDUserManaged) == 54 static_assert(arraysize(kPermissionButtonTextIDUserManaged) ==
55 CONTENT_SETTING_NUM_SETTINGS, 55 CONTENT_SETTING_NUM_SETTINGS,
56 "kPermissionButtonTextIDUserManaged array size is incorrect"); 56 "kPermissionButtonTextIDUserManaged array size is incorrect");
57 57
58 // The resource id's for the strings that are displayed on the permissions 58 // The resource id's for the strings that are displayed on the permissions
59 // button if the permission setting is the global default setting. 59 // button if the permission setting is the global default setting.
60 const int kPermissionButtonTextIDDefaultSetting[] = { 60 const int kPermissionButtonTextIDDefaultSetting[] = {
61 kInvalidResourceID, 61 kInvalidResourceID,
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 // the first time. 334 // the first time.
335 return IDR_PAGEINFO_INFO; 335 return IDR_PAGEINFO_INFO;
336 } 336 }
337 337
338 // static 338 // static
339 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 339 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
340 const base::string16& first_visit) { 340 const base::string16& first_visit) {
341 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 341 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
342 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 342 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
343 } 343 }
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