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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/ui/search/instant_overlay_controller.h" 10 #include "chrome/browser/ui/search/instant_overlay_controller.h"
11 #include "content/public/browser/notification_observer.h"
12 #include "content/public/browser/notification_registrar.h"
11 13
12 class Browser; 14 class Browser;
13 @class BrowserWindowController; 15 @class BrowserWindowController;
14 @class OverlayableContentsController; 16 @class OverlayableContentsController;
15 17
16 class InstantOverlayControllerMac : public InstantOverlayController { 18 class InstantOverlayControllerMac : public InstantOverlayController,
19 public content::NotificationObserver {
17 public: 20 public:
18 InstantOverlayControllerMac(Browser* browser, 21 InstantOverlayControllerMac(Browser* browser,
19 BrowserWindowController* window, 22 BrowserWindowController* window,
20 OverlayableContentsController* overlay); 23 OverlayableContentsController* overlay);
21 virtual ~InstantOverlayControllerMac(); 24 virtual ~InstantOverlayControllerMac();
22 25
23 private: 26 private:
24 // Overridden from InstantOverlayController: 27 // InstantOverlayController:
25 virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE; 28 virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE;
26 29
30 // content::NotificationObserver:
31 virtual void Observe(int type,
32 const content::NotificationSource& source,
33 const content::NotificationDetails& details) OVERRIDE;
34
27 BrowserWindowController* const window_; 35 BrowserWindowController* const window_;
28 OverlayableContentsController* const overlay_; 36 OverlayableContentsController* const overlay_;
37 content::NotificationRegistrar registrar_;
29 38
30 DISALLOW_COPY_AND_ASSIGN(InstantOverlayControllerMac); 39 DISALLOW_COPY_AND_ASSIGN(InstantOverlayControllerMac);
31 }; 40 };
32 41
33 #endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H _ 42 #endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H _
OLDNEW
« 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