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 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #import "base/auto_reset.h" | 9 #import "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/mac/bind_objc_block.h" | 11 #include "base/mac/bind_objc_block.h" |
12 #include "base/mac/foundation_util.h" | 12 #include "base/mac/foundation_util.h" |
13 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
14 #import "base/mac/scoped_nsobject.h" | 14 #import "base/mac/scoped_nsobject.h" |
15 #import "base/mac/sdk_forward_declarations.h" | 15 #import "base/mac/sdk_forward_declarations.h" |
16 #include "base/metrics/histogram.h" | 16 #include "base/metrics/histogram.h" |
| 17 #include "base/threading/thread_task_runner_handle.h" |
17 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/permissions/permission_request_manager.h" | 19 #include "chrome/browser/permissions/permission_request_manager.h" |
19 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 21 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
21 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 22 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
22 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
23 #include "chrome/browser/ui/browser_window_state.h" | 24 #include "chrome/browser/ui/browser_window_state.h" |
| 25 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" |
24 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h" | 26 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h" |
25 #import "chrome/browser/ui/cocoa/browser_window_layout.h" | 27 #import "chrome/browser/ui/cocoa/browser_window_layout.h" |
26 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" | |
27 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con
troller.h" | 28 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con
troller.h" |
28 #import "chrome/browser/ui/cocoa/custom_frame_view.h" | 29 #import "chrome/browser/ui/cocoa/custom_frame_view.h" |
29 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" | 30 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
30 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 31 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
31 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 32 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
32 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" | 33 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" |
33 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 34 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
34 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h" | 35 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h" |
| 36 #import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h" |
35 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 37 #import "chrome/browser/ui/cocoa/fullscreen_window.h" |
36 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 38 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
37 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" | 39 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" |
38 #import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h" | |
39 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 40 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" |
40 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" | 41 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" |
41 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 42 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" |
42 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" | 43 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" |
43 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" | 44 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" |
44 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 45 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
45 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 46 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
46 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" | 47 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" |
47 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 48 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 49 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
738 return; | 739 return; |
739 if (currentFrame.size.width != expectedFrame.size.width) | 740 if (currentFrame.size.width != expectedFrame.size.width) |
740 return; | 741 return; |
741 CGFloat heightDelta = | 742 CGFloat heightDelta = |
742 expectedFrame.size.height - currentFrame.size.height; | 743 expectedFrame.size.height - currentFrame.size.height; |
743 if (fabs(heightDelta - kExpectedHeightDifference) > 0.01) | 744 if (fabs(heightDelta - kExpectedHeightDifference) > 0.01) |
744 return; | 745 return; |
745 | 746 |
746 [[self window] setFrame:expectedFrame display:YES]; | 747 [[self window] setFrame:expectedFrame display:YES]; |
747 }); | 748 }); |
748 base::MessageLoop::current()->PostTask(FROM_HERE, callback); | 749 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback); |
749 } | 750 } |
750 | 751 |
751 if (notification) // For System Fullscreen when non-nil. | 752 if (notification) // For System Fullscreen when non-nil. |
752 [self deregisterForContentViewResizeNotifications]; | 753 [self deregisterForContentViewResizeNotifications]; |
753 | 754 |
754 enteringImmersiveFullscreen_ = NO; | 755 enteringImmersiveFullscreen_ = NO; |
755 | 756 |
756 [self resetCustomAppKitFullscreenVariables]; | 757 [self resetCustomAppKitFullscreenVariables]; |
757 [[tabStripController_ activeTabContentsController] | 758 [[tabStripController_ activeTabContentsController] |
758 updateFullscreenWidgetFrame]; | 759 updateFullscreenWidgetFrame]; |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1296 if (fullscreenLowPowerCoordinator_) | 1297 if (fullscreenLowPowerCoordinator_) |
1297 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); | 1298 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
1298 } | 1299 } |
1299 | 1300 |
1300 - (void)childWindowsDidChange { | 1301 - (void)childWindowsDidChange { |
1301 if (fullscreenLowPowerCoordinator_) | 1302 if (fullscreenLowPowerCoordinator_) |
1302 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); | 1303 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
1303 } | 1304 } |
1304 | 1305 |
1305 @end // @implementation BrowserWindowController(Private) | 1306 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |