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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 12039058: content: convert zoom notifications to observer usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 11 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/profiles/off_the_record_profile_impl.h
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h
index 0da387471948fbbeb34673d42026aca56bce148b..10a8d03dd95916d08541f3111a08004155ff4b1a 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.h
+++ b/chrome/browser/profiles/off_the_record_profile_impl.h
@@ -11,8 +11,7 @@
#include "chrome/browser/profiles/off_the_record_profile_io_data.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_list.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/host_zoom_map.h"
using base::Time;
using base::TimeDelta;
@@ -26,8 +25,7 @@ using base::TimeDelta;
// Providing this header file is for unit testing.
//
////////////////////////////////////////////////////////////////////////////////
-class OffTheRecordProfileImpl : public Profile,
- public content::NotificationObserver {
+class OffTheRecordProfileImpl : public Profile {
public:
explicit OffTheRecordProfileImpl(Profile* real_profile);
virtual ~OffTheRecordProfileImpl();
@@ -105,11 +103,6 @@ class OffTheRecordProfileImpl : public Profile,
GetSpeechRecognitionPreferences() OVERRIDE;
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
- // content::NotificationObserver implementation.
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
private:
FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
void InitHostZoomMap();
@@ -121,7 +114,7 @@ class OffTheRecordProfileImpl : public Profile,
virtual base::Callback<ChromeURLDataManagerBackend*(void)>
GetChromeURLDataManagerBackendGetter() const OVERRIDE;
- content::NotificationRegistrar registrar_;
+ void OnZoomLevelChanged(const std::string& host);
// The real underlying profile.
Profile* profile_;
@@ -141,6 +134,8 @@ class OffTheRecordProfileImpl : public Profile,
scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+ content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_;
+
DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
};
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | chrome/browser/ui/zoom/zoom_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698