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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h

Issue 14242004: Speculative fix for instant overlay crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
index 2da31f739a6a0c824308a9caf4f90c167a66efc2..0fc16af3e986a2d1fdfbb3f8056801f78f56cf66 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
@@ -8,12 +8,15 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "chrome/browser/ui/search/instant_overlay_controller.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
class Browser;
@class BrowserWindowController;
@class OverlayableContentsController;
-class InstantOverlayControllerMac : public InstantOverlayController {
+class InstantOverlayControllerMac : public InstantOverlayController,
+ public content::NotificationObserver {
public:
InstantOverlayControllerMac(Browser* browser,
BrowserWindowController* window,
@@ -21,11 +24,17 @@ class InstantOverlayControllerMac : public InstantOverlayController {
virtual ~InstantOverlayControllerMac();
private:
- // Overridden from InstantOverlayController:
+ // InstantOverlayController:
virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE;
+ // content::NotificationObserver:
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
+
BrowserWindowController* const window_;
OverlayableContentsController* const overlay_;
+ content::NotificationRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(InstantOverlayControllerMac);
};
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698