| Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h (revision 170901)
|
| +++ chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h (working copy)
|
| @@ -9,8 +9,6 @@
|
|
|
| #include "base/memory/scoped_nsobject.h"
|
| #include "chrome/browser/ui/constrained_window.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
|
|
| namespace content {
|
| class WebContents;
|
| @@ -27,8 +25,7 @@
|
| // Constrained window implementation for Mac.
|
| // Normally an instance of this class is owned by the delegate. The delegate
|
| // should delete the instance when the window is closed.
|
| -class ConstrainedWindowMac2 : public ConstrainedWindow,
|
| - public content::NotificationObserver {
|
| +class ConstrainedWindowMac2 : public ConstrainedWindow {
|
| public:
|
| ConstrainedWindowMac2(ConstrainedWindowMacDelegate2* delegate,
|
| content::WebContents* web_contents,
|
| @@ -43,11 +40,6 @@
|
| virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
|
| virtual bool CanShowConstrainedWindow() OVERRIDE;
|
|
|
| - // content::NotificationObserver:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| private:
|
| // Gets the parent window of the dialog.
|
| NSWindow* GetParentWindow() const;
|
| @@ -58,12 +50,6 @@
|
| content::WebContents* web_contents_;
|
|
|
| scoped_nsobject<NSWindow> window_;
|
| -
|
| - // A scoped container for notification registries.
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| - // This is true if the constrained window is waiting to be shown.
|
| - bool pending_show_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_CONSTRAINED_WINDOW_MAC_2_
|
|
|