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