| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 7 |
| 8 #include "base/memory/scoped_nsobject.h" | 8 #include "base/memory/scoped_nsobject.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 virtual void ShowPasswordGenerationBubble( | 142 virtual void ShowPasswordGenerationBubble( |
| 143 const gfx::Rect& rect, | 143 const gfx::Rect& rect, |
| 144 const content::PasswordForm& form, | 144 const content::PasswordForm& form, |
| 145 autofill::PasswordGenerator* password_generator) OVERRIDE; | 145 autofill::PasswordGenerator* password_generator) OVERRIDE; |
| 146 | 146 |
| 147 // Overridden from ExtensionKeybindingRegistry::Delegate: | 147 // Overridden from ExtensionKeybindingRegistry::Delegate: |
| 148 virtual extensions::ActiveTabPermissionGranter* | 148 virtual extensions::ActiveTabPermissionGranter* |
| 149 GetActiveTabPermissionGranter() OVERRIDE; | 149 GetActiveTabPermissionGranter() OVERRIDE; |
| 150 | 150 |
| 151 // Overridden from chrome::search::SearchModelObserver: | 151 // Overridden from chrome::search::SearchModelObserver: |
| 152 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 152 virtual void ModelChanged( |
| 153 const chrome::search::Mode& new_mode) OVERRIDE; | 153 const chrome::search::SearchModel::State& old_state, |
| 154 const chrome::search::SearchModel::State& new_state) OVERRIDE; |
| 154 | 155 |
| 155 // Adds the given FindBar cocoa controller to this browser window. | 156 // Adds the given FindBar cocoa controller to this browser window. |
| 156 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 157 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
| 157 | 158 |
| 158 // Returns the cocoa-world BrowserWindowController | 159 // Returns the cocoa-world BrowserWindowController |
| 159 BrowserWindowController* cocoa_controller() { return controller_; } | 160 BrowserWindowController* cocoa_controller() { return controller_; } |
| 160 | 161 |
| 161 protected: | 162 protected: |
| 162 virtual void DestroyBrowser() OVERRIDE; | 163 virtual void DestroyBrowser() OVERRIDE; |
| 163 | 164 |
| 164 private: | 165 private: |
| 165 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 166 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 166 | 167 |
| 167 Browser* browser_; // weak, owned by controller | 168 Browser* browser_; // weak, owned by controller |
| 168 BrowserWindowController* controller_; // weak, owns us | 169 BrowserWindowController* controller_; // weak, owns us |
| 169 base::WeakPtrFactory<Browser> confirm_close_factory_; | 170 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 170 scoped_nsobject<NSString> pending_window_title_; | 171 scoped_nsobject<NSString> pending_window_title_; |
| 171 ui::WindowShowState initial_show_state_; | 172 ui::WindowShowState initial_show_state_; |
| 172 NSInteger attention_request_id_; // identifier from requestUserAttention | 173 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 173 }; | 174 }; |
| 174 | 175 |
| 175 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 176 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |