| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_BROWSER_WINDOW_COCOA_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/scoped_nsobject.h" | 9 #include "base/memory/scoped_nsobject.h" |
| 10 #include "base/task.h" | 10 #include "base/task.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 virtual void ToggleUseCompactNavigationBar() {} | 108 virtual void ToggleUseCompactNavigationBar() {} |
| 109 virtual void OpenTabpose(); | 109 virtual void OpenTabpose(); |
| 110 virtual void PrepareForInstant(); | 110 virtual void PrepareForInstant(); |
| 111 virtual void ShowInstant(TabContentsWrapper* preview); | 111 virtual void ShowInstant(TabContentsWrapper* preview); |
| 112 virtual void HideInstant(bool instant_is_active); | 112 virtual void HideInstant(bool instant_is_active); |
| 113 virtual gfx::Rect GetInstantBounds(); | 113 virtual gfx::Rect GetInstantBounds(); |
| 114 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 114 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 115 const gfx::Rect& bounds); | 115 const gfx::Rect& bounds); |
| 116 | 116 |
| 117 // Overridden from NotificationObserver | 117 // Overridden from NotificationObserver |
| 118 virtual void Observe(NotificationType type, | 118 virtual void Observe(int type, |
| 119 const NotificationSource& source, | 119 const NotificationSource& source, |
| 120 const NotificationDetails& details); | 120 const NotificationDetails& details); |
| 121 | 121 |
| 122 // Adds the given FindBar cocoa controller to this browser window. | 122 // Adds the given FindBar cocoa controller to this browser window. |
| 123 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 123 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
| 124 | 124 |
| 125 // Returns the cocoa-world BrowserWindowController | 125 // Returns the cocoa-world BrowserWindowController |
| 126 BrowserWindowController* cocoa_controller() { return controller_; } | 126 BrowserWindowController* cocoa_controller() { return controller_; } |
| 127 | 127 |
| 128 protected: | 128 protected: |
| 129 virtual void DestroyBrowser(); | 129 virtual void DestroyBrowser(); |
| 130 | 130 |
| 131 private: | 131 private: |
| 132 int GetCommandId(const NativeWebKeyboardEvent& event); | 132 int GetCommandId(const NativeWebKeyboardEvent& event); |
| 133 bool HandleKeyboardEventInternal(NSEvent* event); | 133 bool HandleKeyboardEventInternal(NSEvent* event); |
| 134 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 134 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 135 void UpdateSidebarForContents(TabContents* tab_contents); | 135 void UpdateSidebarForContents(TabContents* tab_contents); |
| 136 | 136 |
| 137 NotificationRegistrar registrar_; | 137 NotificationRegistrar registrar_; |
| 138 Browser* browser_; // weak, owned by controller | 138 Browser* browser_; // weak, owned by controller |
| 139 BrowserWindowController* controller_; // weak, owns us | 139 BrowserWindowController* controller_; // weak, owns us |
| 140 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; | 140 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; |
| 141 scoped_nsobject<NSString> pending_window_title_; | 141 scoped_nsobject<NSString> pending_window_title_; |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 144 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |