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

Side by Side Diff: chrome/browser/ui/gtk/website_settings/permission_selector.cc

Issue 11571010: fixed the DCHECK and also corrected the website setting UI for media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Markus' comment and consolidated |web_content_|. Created 8 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 | Annotate | Revision Log
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/gtk/website_settings/permission_selector.h" 5 #include "chrome/browser/ui/gtk/website_settings/permission_selector.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 10 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
(...skipping 20 matching lines...) Expand all
31 return CONTENT_SETTING_BLOCK; 31 return CONTENT_SETTING_BLOCK;
32 default: 32 default:
33 NOTREACHED(); 33 NOTREACHED();
34 return CONTENT_SETTING_DEFAULT; 34 return CONTENT_SETTING_DEFAULT;
35 } 35 }
36 } 36 }
37 37
38 } // namespace 38 } // namespace
39 39
40 PermissionSelector::PermissionSelector(GtkThemeService* theme_service, 40 PermissionSelector::PermissionSelector(GtkThemeService* theme_service,
41 const GURL& url,
41 ContentSettingsType type, 42 ContentSettingsType type,
42 ContentSetting setting, 43 ContentSetting setting,
43 ContentSetting default_setting, 44 ContentSetting default_setting,
44 content_settings::SettingSource source) 45 content_settings::SettingSource source)
45 : widget_(NULL), 46 : widget_(NULL),
46 menu_button_(NULL), 47 menu_button_(NULL),
47 icon_(NULL), 48 icon_(NULL),
48 type_(type), 49 type_(type),
49 default_setting_(default_setting), 50 default_setting_(default_setting),
50 setting_(setting) { 51 setting_(setting) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } else { 96 } else {
96 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 97 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
97 arrow = gtk_image_new_from_pixbuf( 98 arrow = gtk_image_new_from_pixbuf(
98 rb.GetNativeImageNamed(IDR_APP_DROPARROW).ToGdkPixbuf()); 99 rb.GetNativeImageNamed(IDR_APP_DROPARROW).ToGdkPixbuf());
99 } 100 }
100 gtk_box_pack_start(GTK_BOX(button_hbox), arrow, FALSE, FALSE, 0); 101 gtk_box_pack_start(GTK_BOX(button_hbox), arrow, FALSE, FALSE, 0);
101 } 102 }
102 gtk_button_set_relief(GTK_BUTTON(menu_button_), GTK_RELIEF_NONE); 103 gtk_button_set_relief(GTK_BUTTON(menu_button_), GTK_RELIEF_NONE);
103 gtk_box_pack_start(GTK_BOX(widget_), menu_button_, FALSE, FALSE, 0); 104 gtk_box_pack_start(GTK_BOX(widget_), menu_button_, FALSE, FALSE, 0);
104 105
105 menu_model_.reset(new PermissionMenuModel(this, type, default_setting, 106 menu_model_.reset(new PermissionMenuModel(this, url, type, default_setting,
106 setting)); 107 setting));
107 MenuGtk::Delegate* delegate = new MenuGtk::Delegate(); 108 MenuGtk::Delegate* delegate = new MenuGtk::Delegate();
108 menu_.reset(new MenuGtk(delegate, menu_model_.get())); 109 menu_.reset(new MenuGtk(delegate, menu_model_.get()));
109 g_signal_connect(menu_button_, "button-press-event", 110 g_signal_connect(menu_button_, "button-press-event",
110 G_CALLBACK(OnMenuButtonPressEventThunk), this); 111 G_CALLBACK(OnMenuButtonPressEventThunk), this);
111 } 112 }
112 113
113 PermissionSelector::~PermissionSelector() { 114 PermissionSelector::~PermissionSelector() {
114 } 115 }
115 116
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 content_settings::SETTING_SOURCE_USER)).c_str()); 153 content_settings::SETTING_SOURCE_USER)).c_str());
153 154
154 FOR_EACH_OBSERVER(PermissionSelectorObserver, 155 FOR_EACH_OBSERVER(PermissionSelectorObserver,
155 observer_list_, 156 observer_list_,
156 OnPermissionChanged(this)); 157 OnPermissionChanged(this));
157 } 158 }
158 159
159 bool PermissionSelector::IsCommandIdChecked(int command_id) { 160 bool PermissionSelector::IsCommandIdChecked(int command_id) {
160 return setting_ == CommandIdToContentSetting(command_id); 161 return setting_ == CommandIdToContentSetting(command_id);
161 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698