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

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

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 #ifndef CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_
6 #define CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_ 6 #define CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 12 matching lines...) Expand all
23 // The class |PermissionSelector| allows to change the permission |setting| of a 23 // The class |PermissionSelector| allows to change the permission |setting| of a
24 // given permission |type|. 24 // given permission |type|.
25 class PermissionSelector : public PermissionMenuModel::Delegate { 25 class PermissionSelector : public PermissionMenuModel::Delegate {
26 public: 26 public:
27 // Creates a |PermissionSelector| for the given permission |type|. |setting| 27 // Creates a |PermissionSelector| for the given permission |type|. |setting|
28 // is the current permissions setting. It is possible to pass 28 // is the current permissions setting. It is possible to pass
29 // |CONTENT_SETTING_DEFAULT| as value for |setting|. |default_setting| is the 29 // |CONTENT_SETTING_DEFAULT| as value for |setting|. |default_setting| is the
30 // effective default setting for the given permission |type|. It is not 30 // effective default setting for the given permission |type|. It is not
31 // allowed to pass |CONTENT_SETTING_DEFAULT| as value for |default_setting|. 31 // allowed to pass |CONTENT_SETTING_DEFAULT| as value for |default_setting|.
32 PermissionSelector(GtkThemeService* theme_service, 32 PermissionSelector(GtkThemeService* theme_service,
33 const GURL& url,
33 ContentSettingsType type, 34 ContentSettingsType type,
34 ContentSetting setting, 35 ContentSetting setting,
35 ContentSetting default_setting, 36 ContentSetting default_setting,
36 content_settings::SettingSource source); 37 content_settings::SettingSource source);
37 virtual ~PermissionSelector(); 38 virtual ~PermissionSelector();
38 39
39 // Returns the container widget that contains all |PermissionSelector| UI 40 // Returns the container widget that contains all |PermissionSelector| UI
40 // widgets. 41 // widgets.
41 GtkWidget* widget() { return widget_; } 42 GtkWidget* widget() { return widget_; }
42 43
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 85
85 // The currently active setting for the permission |type_|. 86 // The currently active setting for the permission |type_|.
86 ContentSetting setting_; 87 ContentSetting setting_;
87 88
88 ObserverList<PermissionSelectorObserver, false> observer_list_; 89 ObserverList<PermissionSelectorObserver, false> observer_list_;
89 90
90 DISALLOW_COPY_AND_ASSIGN(PermissionSelector); 91 DISALLOW_COPY_AND_ASSIGN(PermissionSelector);
91 }; 92 };
92 93
93 #endif // CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_ 94 #endif // CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_PERMISSION_SELECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698