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

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

Issue 11421029: Remove PrefObserver usages, batch 13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix - rebase Created 8 years, 1 month 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 5aa54be5c6d6a08171a52f04f03c88a30182dbab..c39336d80cc50de43c743f18a5cf1e856743effc 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/prefs/public/pref_change_registrar.h"
-#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/pepper_flash_settings_manager.h"
#include "chrome/browser/ui/webui/options/options_ui.h"
#include "chrome/common/content_settings.h"
@@ -24,8 +23,7 @@ class ProtocolHandlerRegistry;
namespace options {
class ContentSettingsHandler : public OptionsPageUIHandler,
- public PepperFlashSettingsManager::Client,
- public PrefObserver {
+ public PepperFlashSettingsManager::Client {
public:
ContentSettingsHandler();
virtual ~ContentSettingsHandler();
@@ -42,10 +40,6 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // PrefObserver implementation.
- virtual void OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) OVERRIDE;
-
// PepperFlashSettingsManager::Client implementation.
virtual void OnGetPermissionSettingsCompleted(
uint32 request_id,
@@ -85,8 +79,7 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
void UpdateExceptionsViewFromModel(const ExContentSettingsType& type);
// Clobbers and rebuilds the specific content setting type exceptions
// OTR table.
- void UpdateOTRExceptionsViewFromModel(
- const ExContentSettingsType& type);
+ void UpdateOTRExceptionsViewFromModel(const ExContentSettingsType& type);
// Clobbers and rebuilds all the exceptions tables in the page (both normal
// and OTR tables).
void UpdateAllExceptionsViewsFromModel();
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698