| 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/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 138 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
| 139 | 139 |
| 140 // Returns the cocoa-world BrowserWindowController | 140 // Returns the cocoa-world BrowserWindowController |
| 141 BrowserWindowController* cocoa_controller() { return controller_; } | 141 BrowserWindowController* cocoa_controller() { return controller_; } |
| 142 | 142 |
| 143 protected: | 143 protected: |
| 144 virtual void DestroyBrowser() OVERRIDE; | 144 virtual void DestroyBrowser() OVERRIDE; |
| 145 | 145 |
| 146 private: | 146 private: |
| 147 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 147 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 148 void UpdateSidebarForContents(TabContents* tab_contents); | |
| 149 | 148 |
| 150 content::NotificationRegistrar registrar_; | 149 content::NotificationRegistrar registrar_; |
| 151 PrefChangeRegistrar pref_change_registrar_; | 150 PrefChangeRegistrar pref_change_registrar_; |
| 152 Browser* browser_; // weak, owned by controller | 151 Browser* browser_; // weak, owned by controller |
| 153 BrowserWindowController* controller_; // weak, owns us | 152 BrowserWindowController* controller_; // weak, owns us |
| 154 base::WeakPtrFactory<Browser> confirm_close_factory_; | 153 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 155 scoped_nsobject<NSString> pending_window_title_; | 154 scoped_nsobject<NSString> pending_window_title_; |
| 156 ui::WindowShowState initial_show_state_; | 155 ui::WindowShowState initial_show_state_; |
| 157 }; | 156 }; |
| 158 | 157 |
| 159 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 158 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |