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

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.h

Issue 2237823003: Site Settings Desktop: Implement USB devices section. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/content_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index a4d047d09ee441c71c61d6780e9b845b0a53f9eb..768ff702a69fd28cad905b27e7ff327f04276b14 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -28,6 +28,10 @@ class HostContentSettingsMap;
class Profile;
class ProtocolHandlerRegistry;
+namespace site_settings {
+struct ChooserTypeNameEntry;
+}
+
namespace options {
class ContentSettingsHandler : public OptionsPageUIHandler,
@@ -35,8 +39,6 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
public content::NotificationObserver,
public PepperFlashSettingsManager::Client {
public:
- struct ChooserTypeNameEntry;
-
ContentSettingsHandler();
~ContentSettingsHandler() override;
@@ -161,11 +163,11 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
// Clobbers and rebuilds the exception table for a particular chooser-based
// permission.
void UpdateChooserExceptionsViewFromModel(
- const ChooserTypeNameEntry& chooser_type);
+ const site_settings::ChooserTypeNameEntry& chooser_type);
// As above, but only OTR tables.
void UpdateOTRChooserExceptionsViewFromModel(
- const ChooserTypeNameEntry& chooser_type);
+ const site_settings::ChooserTypeNameEntry& chooser_type);
// Modifies the zoom level exceptions list to display correct chrome
// signin page entry. When the legacy (non-WebView-based) signin page
@@ -207,8 +209,9 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
// Removes one exception for a chooser-based permission. |args| contains the
// parameters passed to RemoveException().
- void RemoveChooserException(const ChooserTypeNameEntry* chooser_type,
- const base::ListValue* args);
+ void RemoveChooserException(
+ const site_settings::ChooserTypeNameEntry* chooser_type,
+ const base::ListValue* args);
// Callbacks used by the page ------------------------------------------------
@@ -248,11 +251,6 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
void RefreshFlashMediaSettings();
- // Fills in |exceptions| with Values for the given |type| from |map|.
- void GetChooserExceptionsFromProfile(bool incognito,
- const ChooserTypeNameEntry& type,
- base::ListValue* exceptions);
-
void OnPepperFlashPrefChanged();
// content::HostZoomMap subscription.

Powered by Google App Engine
This is Rietveld 408576698