Chromium Code Reviews| 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/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 173 // Overridden from SearchModelObserver: | 173 // Overridden from SearchModelObserver: |
| 174 void ModelChanged(const SearchModel::State& old_state, | 174 void ModelChanged(const SearchModel::State& old_state, |
| 175 const SearchModel::State& new_state) override; | 175 const SearchModel::State& new_state) override; |
| 176 | 176 |
| 177 // Adds the given FindBar cocoa controller to this browser window. | 177 // Adds the given FindBar cocoa controller to this browser window. |
| 178 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 178 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
| 179 | 179 |
| 180 // Returns the cocoa-world BrowserWindowController | 180 // Returns the cocoa-world BrowserWindowController |
| 181 BrowserWindowController* cocoa_controller() { return controller_; } | 181 BrowserWindowController* cocoa_controller() { return controller_; } |
| 182 | 182 |
| 183 void UpdateMediaState(TabMediaState media_state); | |
|
Robert Sesek
2015/10/23 14:26:37
Copy the comment that was lost.
| |
| 184 | |
| 183 protected: | 185 protected: |
| 184 void DestroyBrowser() override; | 186 void DestroyBrowser() override; |
| 185 | 187 |
| 186 private: | 188 private: |
| 187 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 189 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 188 | 190 |
| 189 Browser* browser_; // weak, owned by controller | 191 Browser* browser_; // weak, owned by controller |
| 190 BrowserWindowController* controller_; // weak, owns us | 192 BrowserWindowController* controller_; // weak, owns us |
| 191 base::scoped_nsobject<NSString> pending_window_title_; | 193 base::scoped_nsobject<NSString> pending_window_title_; |
| 192 ui::WindowShowState initial_show_state_; | 194 ui::WindowShowState initial_show_state_; |
| 193 NSInteger attention_request_id_; // identifier from requestUserAttention | 195 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 196 | |
| 197 TabMediaState media_state_; | |
|
Robert Sesek
2015/10/23 14:26:37
This should also have a comment.
| |
| 194 }; | 198 }; |
| 195 | 199 |
| 196 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 200 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |