| 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 #import "base/memory/scoped_nsobject.h" | 10 #import "base/memory/scoped_nsobject.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
| 13 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 13 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/profiles/profile_info_util.h" | 15 #include "chrome/browser/profiles/profile_info_util.h" |
| 16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
| 17 #include "chrome/browser/ui/browser_list.h" | 17 #include "chrome/browser/ui/browser_list.h" |
| 18 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" | 18 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
| 19 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 19 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
| 20 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 20 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
| 21 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" | 21 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h" |
| 22 #import "chrome/browser/ui/cocoa/focus_tracker.h" | |
| 23 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 22 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
| 24 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 23 #import "chrome/browser/ui/cocoa/fullscreen_window.h" |
| 25 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 24 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
| 26 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" | 25 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" |
| 27 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 26 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| 28 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h" | 27 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h" |
| 29 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" | 28 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
| 30 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 29 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
| 31 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 30 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 32 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 31 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 33 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 34 #include "content/browser/renderer_host/render_widget_host_view.h" | 33 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 35 #include "content/public/browser/web_contents.h" | 34 #include "content/public/browser/web_contents.h" |
| 36 #include "content/public/browser/web_contents_view.h" | 35 #include "content/public/browser/web_contents_view.h" |
| 36 #import "ui/base/cocoa/focus_tracker.h" |
| 37 #include "ui/base/ui_base_types.h" | 37 #include "ui/base/ui_base_types.h" |
| 38 | 38 |
| 39 using content::WebContents; | 39 using content::WebContents; |
| 40 | 40 |
| 41 // Forward-declare symbols that are part of the 10.6 SDK. | 41 // Forward-declare symbols that are part of the 10.6 SDK. |
| 42 #if !defined(MAC_OS_X_VERSION_10_6) || \ | 42 #if !defined(MAC_OS_X_VERSION_10_6) || \ |
| 43 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | 43 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 |
| 44 | 44 |
| 45 enum { | 45 enum { |
| 46 NSApplicationPresentationDefault = 0, | 46 NSApplicationPresentationDefault = 0, |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 899 - (void)disableBarVisibilityUpdates { | 899 - (void)disableBarVisibilityUpdates { |
| 900 // Early escape if there's nothing to do. | 900 // Early escape if there's nothing to do. |
| 901 if (!barVisibilityUpdatesEnabled_) | 901 if (!barVisibilityUpdatesEnabled_) |
| 902 return; | 902 return; |
| 903 | 903 |
| 904 barVisibilityUpdatesEnabled_ = NO; | 904 barVisibilityUpdatesEnabled_ = NO; |
| 905 [presentationModeController_ cancelAnimationAndTimers]; | 905 [presentationModeController_ cancelAnimationAndTimers]; |
| 906 } | 906 } |
| 907 | 907 |
| 908 @end // @implementation BrowserWindowController(Private) | 908 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |