| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 void EnterFullscreen(const GURL& url, | 80 void EnterFullscreen(const GURL& url, |
| 81 ExclusiveAccessBubbleType type, | 81 ExclusiveAccessBubbleType type, |
| 82 bool with_toolbar) override; | 82 bool with_toolbar) override; |
| 83 void ExitFullscreen() override; | 83 void ExitFullscreen() override; |
| 84 void UpdateExclusiveAccessExitBubbleContent( | 84 void UpdateExclusiveAccessExitBubbleContent( |
| 85 const GURL& url, | 85 const GURL& url, |
| 86 ExclusiveAccessBubbleType bubble_type) override; | 86 ExclusiveAccessBubbleType bubble_type) override; |
| 87 bool ShouldHideUIForFullscreen() const override; | 87 bool ShouldHideUIForFullscreen() const override; |
| 88 bool IsFullscreen() const override; | 88 bool IsFullscreen() const override; |
| 89 bool IsFullscreenBubbleVisible() const override; | 89 bool IsFullscreenBubbleVisible() const override; |
| 90 bool SupportsFullscreenWithToolbar() const override; | |
| 91 void UpdateFullscreenWithToolbar(bool with_toolbar) override; | 90 void UpdateFullscreenWithToolbar(bool with_toolbar) override; |
| 91 void ToggleFullscreenToolbar() override; |
| 92 bool IsFullscreenWithToolbar() const override; | 92 bool IsFullscreenWithToolbar() const override; |
| 93 bool ShouldHideFullscreenToolbar() const override; |
| 93 LocationBar* GetLocationBar() const override; | 94 LocationBar* GetLocationBar() const override; |
| 94 void SetFocusToLocationBar(bool select_all) override; | 95 void SetFocusToLocationBar(bool select_all) override; |
| 95 void UpdateReloadStopState(bool is_loading, bool force) override; | 96 void UpdateReloadStopState(bool is_loading, bool force) override; |
| 96 void UpdateToolbar(content::WebContents* contents) override; | 97 void UpdateToolbar(content::WebContents* contents) override; |
| 97 void ResetToolbarTabState(content::WebContents* contents) override; | 98 void ResetToolbarTabState(content::WebContents* contents) override; |
| 98 void FocusToolbar() override; | 99 void FocusToolbar() override; |
| 99 ToolbarActionsBar* GetToolbarActionsBar() override; | 100 ToolbarActionsBar* GetToolbarActionsBar() override; |
| 100 void ToolbarSizeChanged(bool is_animating) override; | 101 void ToolbarSizeChanged(bool is_animating) override; |
| 101 void FocusAppMenu() override; | 102 void FocusAppMenu() override; |
| 102 void FocusBookmarksToolbar() override; | 103 void FocusBookmarksToolbar() override; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 188 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 188 | 189 |
| 189 Browser* browser_; // weak, owned by controller | 190 Browser* browser_; // weak, owned by controller |
| 190 BrowserWindowController* controller_; // weak, owns us | 191 BrowserWindowController* controller_; // weak, owns us |
| 191 base::scoped_nsobject<NSString> pending_window_title_; | 192 base::scoped_nsobject<NSString> pending_window_title_; |
| 192 ui::WindowShowState initial_show_state_; | 193 ui::WindowShowState initial_show_state_; |
| 193 NSInteger attention_request_id_; // identifier from requestUserAttention | 194 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 194 }; | 195 }; |
| 195 | 196 |
| 196 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 197 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |