| 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 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/ui/browser_window_state.h" | 21 #include "chrome/browser/ui/browser_window_state.h" |
| 22 #import "chrome/browser/ui/cocoa/browser_window_layout.h" | 22 #import "chrome/browser/ui/cocoa/browser_window_layout.h" |
| 23 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" | 23 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
| 24 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 24 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
| 25 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 25 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
| 26 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" | 26 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" |
| 27 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 27 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
| 28 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 28 #import "chrome/browser/ui/cocoa/fullscreen_window.h" |
| 29 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 29 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
| 30 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" | 30 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" |
| 31 #import "chrome/browser/ui/cocoa/nsview_additions.h" | |
| 32 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" | 31 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" |
| 33 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 32 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" |
| 34 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" | 33 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" |
| 35 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 34 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| 36 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" | 35 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" |
| 37 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 36 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
| 38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 37 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 39 #import "chrome/browser/ui/cocoa/version_independent_window.h" | 38 #import "chrome/browser/ui/cocoa/version_independent_window.h" |
| 40 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" | 39 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" |
| 41 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" | 40 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
| 42 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 41 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 43 #include "chrome/common/chrome_switches.h" | 42 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 45 #include "content/public/browser/render_widget_host_view.h" | 44 #include "content/public/browser/render_widget_host_view.h" |
| 46 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
| 47 #import "ui/base/cocoa/focus_tracker.h" | 46 #import "ui/base/cocoa/focus_tracker.h" |
| 47 #import "ui/base/cocoa/nsview_additions.h" |
| 48 #include "ui/base/ui_base_types.h" | 48 #include "ui/base/ui_base_types.h" |
| 49 | 49 |
| 50 using content::RenderWidgetHostView; | 50 using content::RenderWidgetHostView; |
| 51 using content::WebContents; | 51 using content::WebContents; |
| 52 | 52 |
| 53 namespace { | 53 namespace { |
| 54 | 54 |
| 55 // Space between the incognito badge and the right edge of the window. | 55 // Space between the incognito badge and the right edge of the window. |
| 56 const CGFloat kAvatarRightOffset = 4; | 56 const CGFloat kAvatarRightOffset = 4; |
| 57 | 57 |
| (...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1025 | 1025 |
| 1026 [CATransaction commit]; | 1026 [CATransaction commit]; |
| 1027 hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES; | 1027 hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES; |
| 1028 } | 1028 } |
| 1029 } else { | 1029 } else { |
| 1030 hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO; | 1030 hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO; |
| 1031 } | 1031 } |
| 1032 } | 1032 } |
| 1033 | 1033 |
| 1034 @end // @implementation BrowserWindowController(Private) | 1034 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |