| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 54 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 54 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 
| 55 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 55 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 
| 56 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 56 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 
| 57 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 57 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 
| 58 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h" | 58 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h" | 
| 59 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 59 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 
| 60 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 60 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 
| 61 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" | 61 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" | 
| 62 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c
      ontroller.h" | 62 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_c
      ontroller.h" | 
| 63 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" | 63 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" | 
| 64 #include "chrome/browser/ui/cocoa/l10n_util.h" |  | 
| 65 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" | 64 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" | 
| 66 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 65 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 
| 67 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" | 66 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" | 
| 68 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 67 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 
| 69 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" | 68 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" | 
| 70 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" | 69 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" | 
| 71 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 70 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 
| 72 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 71 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 
| 73 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 72 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 
| 74 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 73 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 87 #include "components/bookmarks/managed/managed_bookmark_service.h" | 86 #include "components/bookmarks/managed/managed_bookmark_service.h" | 
| 88 #include "components/signin/core/common/profile_management_switches.h" | 87 #include "components/signin/core/common/profile_management_switches.h" | 
| 89 #include "components/translate/core/browser/translate_manager.h" | 88 #include "components/translate/core/browser/translate_manager.h" | 
| 90 #include "components/translate/core/browser/translate_ui_delegate.h" | 89 #include "components/translate/core/browser/translate_ui_delegate.h" | 
| 91 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 90 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 
| 92 #include "content/public/browser/render_view_host.h" | 91 #include "content/public/browser/render_view_host.h" | 
| 93 #include "content/public/browser/render_widget_host.h" | 92 #include "content/public/browser/render_widget_host.h" | 
| 94 #include "content/public/browser/render_widget_host_view.h" | 93 #include "content/public/browser/render_widget_host_view.h" | 
| 95 #include "content/public/browser/web_contents.h" | 94 #include "content/public/browser/web_contents.h" | 
| 96 #import "ui/base/cocoa/cocoa_base_utils.h" | 95 #import "ui/base/cocoa/cocoa_base_utils.h" | 
|  | 96 #import "ui/base/cocoa/rtl_feature.h" | 
| 97 #import "ui/base/cocoa/nsview_additions.h" | 97 #import "ui/base/cocoa/nsview_additions.h" | 
| 98 #include "ui/base/material_design/material_design_controller.h" | 98 #include "ui/base/material_design/material_design_controller.h" | 
| 99 #include "ui/display/screen.h" | 99 #include "ui/display/screen.h" | 
| 100 #import "ui/gfx/mac/coordinate_conversion.h" | 100 #import "ui/gfx/mac/coordinate_conversion.h" | 
| 101 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" | 101 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" | 
| 102 | 102 | 
| 103 using bookmarks::BookmarkModel; | 103 using bookmarks::BookmarkModel; | 
| 104 using bookmarks::BookmarkNode; | 104 using bookmarks::BookmarkNode; | 
| 105 | 105 | 
| 106 // ORGANIZATION: This is a big file. It is (in principle) organized as follows | 106 // ORGANIZATION: This is a big file. It is (in principle) organized as follows | 
| (...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1628   // the browser profile's name unless the browser is incognito. | 1628   // the browser profile's name unless the browser is incognito. | 
| 1629   NSView* view; | 1629   NSView* view; | 
| 1630   if ([self shouldUseNewAvatarButton]) { | 1630   if ([self shouldUseNewAvatarButton]) { | 
| 1631     avatarButtonController_.reset( | 1631     avatarButtonController_.reset( | 
| 1632       [[AvatarButtonController alloc] initWithBrowser:browser_.get()]); | 1632       [[AvatarButtonController alloc] initWithBrowser:browser_.get()]); | 
| 1633   } else { | 1633   } else { | 
| 1634     avatarButtonController_.reset( | 1634     avatarButtonController_.reset( | 
| 1635       [[AvatarIconController alloc] initWithBrowser:browser_.get()]); | 1635       [[AvatarIconController alloc] initWithBrowser:browser_.get()]); | 
| 1636   } | 1636   } | 
| 1637   view = [avatarButtonController_ view]; | 1637   view = [avatarButtonController_ view]; | 
| 1638   if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) | 1638   if (ui::ShouldDoExperimentalRTLLayout()) | 
| 1639     [view setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin]; | 1639     [view setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin]; | 
| 1640   else | 1640   else | 
| 1641     [view setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin]; | 1641     [view setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin]; | 
| 1642   [view setHidden:![self shouldShowAvatar]]; | 1642   [view setHidden:![self shouldShowAvatar]]; | 
| 1643 | 1643 | 
| 1644   // Install the view. | 1644   // Install the view. | 
| 1645   [[[self window] contentView] addSubview:view]; | 1645   [[[self window] contentView] addSubview:view]; | 
| 1646 } | 1646 } | 
| 1647 | 1647 | 
| 1648 // Called when we get a three-finger swipe. | 1648 // Called when we get a three-finger swipe. | 
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1995 | 1995 | 
| 1996 - (NSRect)savedRegularWindowFrame { | 1996 - (NSRect)savedRegularWindowFrame { | 
| 1997   return savedRegularWindowFrame_; | 1997   return savedRegularWindowFrame_; | 
| 1998 } | 1998 } | 
| 1999 | 1999 | 
| 2000 - (BOOL)isFullscreenTransitionInProgress { | 2000 - (BOOL)isFullscreenTransitionInProgress { | 
| 2001   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2001   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 
| 2002 } | 2002 } | 
| 2003 | 2003 | 
| 2004 @end  // @implementation BrowserWindowController(WindowType) | 2004 @end  // @implementation BrowserWindowController(WindowType) | 
| OLD | NEW | 
|---|