| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <numeric> | 8 #include <numeric> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 #include "chrome/browser/ui/browser_window_state.h" | 41 #include "chrome/browser/ui/browser_window_state.h" |
| 42 #import "chrome/browser/ui/cocoa/background_gradient_view.h" | 42 #import "chrome/browser/ui/cocoa/background_gradient_view.h" |
| 43 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 43 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| 44 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h" | 44 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h" |
| 45 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 45 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" |
| 46 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" | 46 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" |
| 47 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 47 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 48 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h" | 48 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h" |
| 49 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 49 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| 50 #import "chrome/browser/ui/cocoa/browser_window_layout.h" | 50 #import "chrome/browser/ui/cocoa/browser_window_layout.h" |
| 51 #import "chrome/browser/ui/cocoa/browser_window_touch_bar.h" |
| 51 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 52 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 52 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" | 53 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
| 53 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 54 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 54 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" | 55 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" |
| 55 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 56 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
| 56 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 57 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 57 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 58 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
| 58 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 59 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
| 59 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" | 60 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" |
| 60 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c
ontroller.h" | 61 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c
ontroller.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 89 #include "components/signin/core/common/profile_management_switches.h" | 90 #include "components/signin/core/common/profile_management_switches.h" |
| 90 #include "components/translate/core/browser/translate_manager.h" | 91 #include "components/translate/core/browser/translate_manager.h" |
| 91 #include "components/translate/core/browser/translate_ui_delegate.h" | 92 #include "components/translate/core/browser/translate_ui_delegate.h" |
| 92 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 93 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 93 #include "content/public/browser/render_view_host.h" | 94 #include "content/public/browser/render_view_host.h" |
| 94 #include "content/public/browser/render_widget_host.h" | 95 #include "content/public/browser/render_widget_host.h" |
| 95 #include "content/public/browser/render_widget_host_view.h" | 96 #include "content/public/browser/render_widget_host_view.h" |
| 96 #include "content/public/browser/web_contents.h" | 97 #include "content/public/browser/web_contents.h" |
| 97 #import "ui/base/cocoa/cocoa_base_utils.h" | 98 #import "ui/base/cocoa/cocoa_base_utils.h" |
| 98 #import "ui/base/cocoa/nsview_additions.h" | 99 #import "ui/base/cocoa/nsview_additions.h" |
| 100 #import "ui/base/cocoa/touch_bar_forward_declarations.h" |
| 99 #include "ui/base/material_design/material_design_controller.h" | 101 #include "ui/base/material_design/material_design_controller.h" |
| 100 #include "ui/display/screen.h" | 102 #include "ui/display/screen.h" |
| 101 #import "ui/gfx/mac/coordinate_conversion.h" | 103 #import "ui/gfx/mac/coordinate_conversion.h" |
| 102 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" | 104 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" |
| 103 | 105 |
| 104 using bookmarks::BookmarkModel; | 106 using bookmarks::BookmarkModel; |
| 105 using bookmarks::BookmarkNode; | 107 using bookmarks::BookmarkNode; |
| 106 | 108 |
| 107 // ORGANIZATION: This is a big file. It is (in principle) organized as follows | 109 // ORGANIZATION: This is a big file. It is (in principle) organized as follows |
| 108 // (in order): | 110 // (in order): |
| (...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 996 - (void)updateToolbarWithContents:(WebContents*)tab { | 998 - (void)updateToolbarWithContents:(WebContents*)tab { |
| 997 [toolbarController_ updateToolbarWithContents:tab]; | 999 [toolbarController_ updateToolbarWithContents:tab]; |
| 998 } | 1000 } |
| 999 | 1001 |
| 1000 - (void)resetTabState:(WebContents*)tab { | 1002 - (void)resetTabState:(WebContents*)tab { |
| 1001 [toolbarController_ resetTabState:tab]; | 1003 [toolbarController_ resetTabState:tab]; |
| 1002 } | 1004 } |
| 1003 | 1005 |
| 1004 - (void)setStarredState:(BOOL)isStarred { | 1006 - (void)setStarredState:(BOOL)isStarred { |
| 1005 [toolbarController_ setStarredState:isStarred]; | 1007 [toolbarController_ setStarredState:isStarred]; |
| 1008 |
| 1009 [touchBar_ setIsStarred:isStarred]; |
| 1010 if ([[self window] respondsToSelector:@selector(setTouchBar:)]) |
| 1011 [[self window] performSelector:@selector(setTouchBar:) withObject:nil]; |
| 1006 } | 1012 } |
| 1007 | 1013 |
| 1008 - (void)setCurrentPageIsTranslated:(BOOL)on { | 1014 - (void)setCurrentPageIsTranslated:(BOOL)on { |
| 1009 [toolbarController_ setTranslateIconLit:on]; | 1015 [toolbarController_ setTranslateIconLit:on]; |
| 1010 } | 1016 } |
| 1011 | 1017 |
| 1012 - (void)onActiveTabChanged:(content::WebContents*)oldContents | 1018 - (void)onActiveTabChanged:(content::WebContents*)oldContents |
| 1013 to:(content::WebContents*)newContents { | 1019 to:(content::WebContents*)newContents { |
| 1014 // No need to remove previous bubble. It will close itself. | 1020 // No need to remove previous bubble. It will close itself. |
| 1015 PermissionRequestManager* manager(nullptr); | 1021 PermissionRequestManager* manager(nullptr); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1137 - (NSArray*)tabViews { | 1143 - (NSArray*)tabViews { |
| 1138 return [tabStripController_ tabViews]; | 1144 return [tabStripController_ tabViews]; |
| 1139 } | 1145 } |
| 1140 | 1146 |
| 1141 - (NSView*)activeTabView { | 1147 - (NSView*)activeTabView { |
| 1142 return [tabStripController_ activeTabView]; | 1148 return [tabStripController_ activeTabView]; |
| 1143 } | 1149 } |
| 1144 | 1150 |
| 1145 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { | 1151 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { |
| 1146 [toolbarController_ setIsLoading:isLoading force:force]; | 1152 [toolbarController_ setIsLoading:isLoading force:force]; |
| 1153 [touchBar_ setIsPageLoading:isLoading]; |
| 1154 if ([[self window] respondsToSelector:@selector(setTouchBar:)]) |
| 1155 [[self window] performSelector:@selector(setTouchBar:) withObject:nil]; |
| 1147 } | 1156 } |
| 1148 | 1157 |
| 1149 // Make the location bar the first responder, if possible. | 1158 // Make the location bar the first responder, if possible. |
| 1150 - (void)focusLocationBar:(BOOL)selectAll { | 1159 - (void)focusLocationBar:(BOOL)selectAll { |
| 1151 [toolbarController_ focusLocationBar:selectAll]; | 1160 [toolbarController_ focusLocationBar:selectAll]; |
| 1152 } | 1161 } |
| 1153 | 1162 |
| 1154 - (void)focusTabContents { | 1163 - (void)focusTabContents { |
| 1155 content::WebContents* const activeWebContents = | 1164 content::WebContents* const activeWebContents = |
| 1156 browser_->tab_strip_model()->GetActiveWebContents(); | 1165 browser_->tab_strip_model()->GetActiveWebContents(); |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1839 | 1848 |
| 1840 - (void)setAlertState:(TabAlertState)alertState { | 1849 - (void)setAlertState:(TabAlertState)alertState { |
| 1841 static_cast<BrowserWindowCocoa*>([self browserWindow]) | 1850 static_cast<BrowserWindowCocoa*>([self browserWindow]) |
| 1842 ->UpdateAlertState(alertState); | 1851 ->UpdateAlertState(alertState); |
| 1843 } | 1852 } |
| 1844 | 1853 |
| 1845 - (TabAlertState)alertState { | 1854 - (TabAlertState)alertState { |
| 1846 return static_cast<BrowserWindowCocoa*>([self browserWindow])->alert_state(); | 1855 return static_cast<BrowserWindowCocoa*>([self browserWindow])->alert_state(); |
| 1847 } | 1856 } |
| 1848 | 1857 |
| 1858 - (BrowserWindowTouchBar*)browserWindowTouchBar { |
| 1859 if (!touchBar_) { |
| 1860 touchBar_.reset( |
| 1861 [[BrowserWindowTouchBar alloc] initWithBrowser:browser_.get()]); |
| 1862 } |
| 1863 |
| 1864 return touchBar_.get(); |
| 1865 } |
| 1866 |
| 1849 @end // @implementation BrowserWindowController | 1867 @end // @implementation BrowserWindowController |
| 1850 | 1868 |
| 1851 @implementation BrowserWindowController(Fullscreen) | 1869 @implementation BrowserWindowController(Fullscreen) |
| 1852 | 1870 |
| 1853 - (void)enterBrowserFullscreen { | 1871 - (void)enterBrowserFullscreen { |
| 1854 [self enterAppKitFullscreen]; | 1872 [self enterAppKitFullscreen]; |
| 1855 } | 1873 } |
| 1856 | 1874 |
| 1857 - (void)updateUIForTabFullscreen: | 1875 - (void)updateUIForTabFullscreen: |
| 1858 (ExclusiveAccessContext::TabFullscreenState)state { | 1876 (ExclusiveAccessContext::TabFullscreenState)state { |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2010 | 2028 |
| 2011 - (NSRect)savedRegularWindowFrame { | 2029 - (NSRect)savedRegularWindowFrame { |
| 2012 return savedRegularWindowFrame_; | 2030 return savedRegularWindowFrame_; |
| 2013 } | 2031 } |
| 2014 | 2032 |
| 2015 - (BOOL)isFullscreenTransitionInProgress { | 2033 - (BOOL)isFullscreenTransitionInProgress { |
| 2016 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2034 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2017 } | 2035 } |
| 2018 | 2036 |
| 2019 @end // @implementation BrowserWindowController(WindowType) | 2037 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |