| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_COCOA_BROWSER_WINDOW_COCOA_H_ | 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
| 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ | 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/task.h" | 9 #include "base/task.h" |
| 10 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 // Returns the cocoa-world BrowserWindowController | 118 // Returns the cocoa-world BrowserWindowController |
| 119 BrowserWindowController* cocoa_controller() { return controller_; } | 119 BrowserWindowController* cocoa_controller() { return controller_; } |
| 120 | 120 |
| 121 protected: | 121 protected: |
| 122 virtual void DestroyBrowser(); | 122 virtual void DestroyBrowser(); |
| 123 | 123 |
| 124 private: | 124 private: |
| 125 int GetCommandId(const NativeWebKeyboardEvent& event); | 125 int GetCommandId(const NativeWebKeyboardEvent& event); |
| 126 bool HandleKeyboardEventInternal(NSEvent* event); | 126 bool HandleKeyboardEventInternal(NSEvent* event); |
| 127 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 127 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 128 void UpdateSidebarForContents(TabContents* tab_contents); |
| 128 | 129 |
| 129 NotificationRegistrar registrar_; | 130 NotificationRegistrar registrar_; |
| 130 Browser* browser_; // weak, owned by controller | 131 Browser* browser_; // weak, owned by controller |
| 131 BrowserWindowController* controller_; // weak, owns us | 132 BrowserWindowController* controller_; // weak, owns us |
| 132 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; | 133 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; |
| 133 }; | 134 }; |
| 134 | 135 |
| 135 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ | 136 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |