| 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" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
| 38 #include "content/public/browser/render_widget_host_view.h" | 38 #include "content/public/browser/render_widget_host_view.h" |
| 39 #include "content/public/browser/web_contents.h" | 39 #include "content/public/browser/web_contents.h" |
| 40 #include "content/public/browser/web_contents_view.h" | 40 #include "content/public/browser/web_contents_view.h" |
| 41 #import "ui/base/cocoa/focus_tracker.h" | 41 #import "ui/base/cocoa/focus_tracker.h" |
| 42 #include "ui/base/ui_base_types.h" | 42 #include "ui/base/ui_base_types.h" |
| 43 | 43 |
| 44 using content::RenderWidgetHostView; | 44 using content::RenderWidgetHostView; |
| 45 using content::WebContents; | 45 using content::WebContents; |
| 46 | 46 |
| 47 // Forward-declare symbols that are part of the 10.6 SDK. | |
| 48 #if !defined(MAC_OS_X_VERSION_10_6) || \ | |
| 49 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | |
| 50 | |
| 51 enum { | |
| 52 NSApplicationPresentationDefault = 0, | |
| 53 NSApplicationPresentationAutoHideDock = (1 << 0), | |
| 54 NSApplicationPresentationHideDock = (1 << 1), | |
| 55 NSApplicationPresentationAutoHideMenuBar = (1 << 2), | |
| 56 NSApplicationPresentationHideMenuBar = (1 << 3), | |
| 57 }; | |
| 58 typedef NSUInteger NSApplicationPresentationOptions; | |
| 59 | |
| 60 #endif // MAC_OS_X_VERSION_10_6 | |
| 61 | |
| 62 namespace { | 47 namespace { |
| 63 | 48 |
| 64 // Space between the incognito badge and the right edge of the window. | 49 // Space between the incognito badge and the right edge of the window. |
| 65 const CGFloat kAvatarRightOffset = 4; | 50 const CGFloat kAvatarRightOffset = 4; |
| 66 | 51 |
| 67 // The amount by which to shrink the tab strip (on the right) when the | 52 // The amount by which to shrink the tab strip (on the right) when the |
| 68 // incognito badge is present. | 53 // incognito badge is present. |
| 69 const CGFloat kAvatarTabStripShrink = 18; | 54 const CGFloat kAvatarTabStripShrink = 18; |
| 70 | 55 |
| 71 // Insets for the location bar, used when the full toolbar is hidden. | 56 // Insets for the location bar, used when the full toolbar is hidden. |
| (...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 - (void)disableBarVisibilityUpdates { | 867 - (void)disableBarVisibilityUpdates { |
| 883 // Early escape if there's nothing to do. | 868 // Early escape if there's nothing to do. |
| 884 if (!barVisibilityUpdatesEnabled_) | 869 if (!barVisibilityUpdatesEnabled_) |
| 885 return; | 870 return; |
| 886 | 871 |
| 887 barVisibilityUpdatesEnabled_ = NO; | 872 barVisibilityUpdatesEnabled_ = NO; |
| 888 [presentationModeController_ cancelAnimationAndTimers]; | 873 [presentationModeController_ cancelAnimationAndTimers]; |
| 889 } | 874 } |
| 890 | 875 |
| 891 @end // @implementation BrowserWindowController(Private) | 876 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |