OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/cocoa/browser_window_controller_private.h" |
6 | 6 |
7 #include "base/mac_util.h" | 7 #include "base/mac_util.h" |
8 #import "base/scoped_nsobject.h" | 8 #import "base/scoped_nsobject.h" |
9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/browser_theme_provider.h" | 12 #include "chrome/browser/browser_theme_provider.h" |
13 #import "chrome/browser/cocoa/chrome_browser_window.h" | 13 #import "chrome/browser/cocoa/chrome_browser_window.h" |
14 #import "chrome/browser/cocoa/fast_resize_view.h" | 14 #import "chrome/browser/cocoa/fast_resize_view.h" |
15 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h" | 15 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h" |
16 #import "chrome/browser/cocoa/floating_bar_backing_view.h" | 16 #import "chrome/browser/cocoa/floating_bar_backing_view.h" |
17 #import "chrome/browser/cocoa/fullscreen_controller.h" | 17 #import "chrome/browser/cocoa/fullscreen_controller.h" |
18 #import "chrome/browser/cocoa/side_tab_strip_controller.h" | 18 #import "chrome/browser/cocoa/side_tab_strip_controller.h" |
19 #import "chrome/browser/cocoa/tab_strip_controller.h" | 19 #import "chrome/browser/cocoa/tab_strip_controller.h" |
20 #import "chrome/browser/cocoa/tab_strip_view.h" | 20 #import "chrome/browser/cocoa/tab_strip_view.h" |
21 #import "chrome/browser/cocoa/toolbar_controller.h" | 21 #import "chrome/browser/cocoa/toolbar_controller.h" |
22 #include "chrome/browser/pref_service.h" | 22 #include "chrome/browser/pref_service.h" |
23 #include "chrome/browser/profile.h" | 23 #include "chrome/browser/profile.h" |
24 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 24 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
25 #include "chrome/browser/tab_contents/tab_contents.h" | 25 #include "chrome/browser/tab_contents/tab_contents.h" |
26 #include "chrome/browser/tab_contents/tab_contents_view.h" | 26 #include "chrome/browser/tab_contents/tab_contents_view.h" |
27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
28 | 28 |
29 | |
30 namespace { | 29 namespace { |
31 | 30 |
32 // Space between the incognito badge and the right edge of the window. | 31 // Space between the incognito badge and the right edge of the window. |
33 const CGFloat kIncognitoBadgeOffset = 4; | 32 const CGFloat kIncognitoBadgeOffset = 4; |
34 | 33 |
35 // Insets for the location bar, used when the full toolbar is hidden. | 34 // Insets for the location bar, used when the full toolbar is hidden. |
36 // TODO(viettrungluu): We can argue about the "correct" insetting; I like the | 35 // TODO(viettrungluu): We can argue about the "correct" insetting; I like the |
37 // following best, though arguably 0 inset is better/more correct. | 36 // following best, though arguably 0 inset is better/more correct. |
38 const CGFloat kLocBarLeftRightInset = 1; | 37 const CGFloat kLocBarLeftRightInset = 1; |
39 const CGFloat kLocBarTopInset = 0; | 38 const CGFloat kLocBarTopInset = 0; |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 - (void)disableBarVisibilityUpdates { | 497 - (void)disableBarVisibilityUpdates { |
499 // Early escape if there's nothing to do. | 498 // Early escape if there's nothing to do. |
500 if (!barVisibilityUpdatesEnabled_) | 499 if (!barVisibilityUpdatesEnabled_) |
501 return; | 500 return; |
502 | 501 |
503 barVisibilityUpdatesEnabled_ = NO; | 502 barVisibilityUpdatesEnabled_ = NO; |
504 [fullscreenController_ cancelAnimationAndTimers]; | 503 [fullscreenController_ cancelAnimationAndTimers]; |
505 } | 504 } |
506 | 505 |
507 @end // @implementation BrowserWindowController(Private) | 506 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |