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 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/ui/browser_commands.h" | 37 #include "chrome/browser/ui/browser_commands.h" |
38 #include "chrome/browser/ui/browser_instant_controller.h" | 38 #include "chrome/browser/ui/browser_instant_controller.h" |
39 #include "chrome/browser/ui/browser_list.h" | 39 #include "chrome/browser/ui/browser_list.h" |
40 #include "chrome/browser/ui/browser_window_state.h" | 40 #include "chrome/browser/ui/browser_window_state.h" |
41 #import "chrome/browser/ui/cocoa/background_gradient_view.h" | 41 #import "chrome/browser/ui/cocoa/background_gradient_view.h" |
42 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 42 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
43 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 43 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" |
44 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 44 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
45 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 45 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
46 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 46 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 47 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con
troller.h" |
47 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" | 48 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
48 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 49 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
49 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" | 50 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" |
50 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 51 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
51 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 52 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
52 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" | 53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
53 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 54 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
54 #import "chrome/browser/ui/cocoa/fullscreen_window.h" | 55 #import "chrome/browser/ui/cocoa/fullscreen_window.h" |
55 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 56 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
56 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" | 57 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" |
(...skipping 1885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1942 return [toolbarController_ customFieldEditorForObject:obj]; | 1943 return [toolbarController_ customFieldEditorForObject:obj]; |
1943 } | 1944 } |
1944 | 1945 |
1945 // (Needed for |BookmarkBarControllerDelegate| protocol.) | 1946 // (Needed for |BookmarkBarControllerDelegate| protocol.) |
1946 - (void)bookmarkBar:(BookmarkBarController*)controller | 1947 - (void)bookmarkBar:(BookmarkBarController*)controller |
1947 didChangeFromState:(BookmarkBar::State)oldState | 1948 didChangeFromState:(BookmarkBar::State)oldState |
1948 toState:(BookmarkBar::State)newState { | 1949 toState:(BookmarkBar::State)newState { |
1949 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; | 1950 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; |
1950 [self adjustToolbarAndBookmarkBarForCompression: | 1951 [self adjustToolbarAndBookmarkBarForCompression: |
1951 [controller getDesiredToolbarHeightCompression]]; | 1952 [controller getDesiredToolbarHeightCompression]]; |
| 1953 |
| 1954 [[ConstrainedWindowSheetController controllerForParentWindow:[self window]] |
| 1955 updateSheetPosition]; |
1952 } | 1956 } |
1953 | 1957 |
1954 // (Needed for |BookmarkBarControllerDelegate| protocol.) | 1958 // (Needed for |BookmarkBarControllerDelegate| protocol.) |
1955 - (void)bookmarkBar:(BookmarkBarController*)controller | 1959 - (void)bookmarkBar:(BookmarkBarController*)controller |
1956 willAnimateFromState:(BookmarkBar::State)oldState | 1960 willAnimateFromState:(BookmarkBar::State)oldState |
1957 toState:(BookmarkBar::State)newState { | 1961 toState:(BookmarkBar::State)newState { |
1958 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; | 1962 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; |
1959 [self adjustToolbarAndBookmarkBarForCompression: | 1963 [self adjustToolbarAndBookmarkBarForCompression: |
1960 [controller getDesiredToolbarHeightCompression]]; | 1964 [controller getDesiredToolbarHeightCompression]]; |
1961 } | 1965 } |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2274 | 2278 |
2275 - (BOOL)supportsBookmarkBar { | 2279 - (BOOL)supportsBookmarkBar { |
2276 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2280 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
2277 } | 2281 } |
2278 | 2282 |
2279 - (BOOL)isTabbedWindow { | 2283 - (BOOL)isTabbedWindow { |
2280 return browser_->is_type_tabbed(); | 2284 return browser_->is_type_tabbed(); |
2281 } | 2285 } |
2282 | 2286 |
2283 @end // @implementation BrowserWindowController(WindowType) | 2287 @end // @implementation BrowserWindowController(WindowType) |
OLD | NEW |