Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 653733002: Revert of Mac: Update sheet position when bookmark bar is shown or hidden. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 27 matching lines...) Expand all
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_layout.h" 46 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
47 #import "chrome/browser/ui/cocoa/browser_window_utils.h" 47 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
48 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
49 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" 48 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
50 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 49 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
51 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h" 50 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h"
52 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 51 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 52 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
54 #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"
55 #import "chrome/browser/ui/cocoa/framed_browser_window.h" 54 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
56 #import "chrome/browser/ui/cocoa/fullscreen_window.h" 55 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
57 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 56 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
58 #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 1909 matching lines...) Expand 10 before | Expand all | Expand 10 after
1968 return [toolbarController_ customFieldEditorForObject:obj]; 1967 return [toolbarController_ customFieldEditorForObject:obj];
1969 } 1968 }
1970 1969
1971 // (Needed for |BookmarkBarControllerDelegate| protocol.) 1970 // (Needed for |BookmarkBarControllerDelegate| protocol.)
1972 - (void)bookmarkBar:(BookmarkBarController*)controller 1971 - (void)bookmarkBar:(BookmarkBarController*)controller
1973 didChangeFromState:(BookmarkBar::State)oldState 1972 didChangeFromState:(BookmarkBar::State)oldState
1974 toState:(BookmarkBar::State)newState { 1973 toState:(BookmarkBar::State)newState {
1975 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; 1974 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
1976 [self adjustToolbarAndBookmarkBarForCompression: 1975 [self adjustToolbarAndBookmarkBarForCompression:
1977 [controller getDesiredToolbarHeightCompression]]; 1976 [controller getDesiredToolbarHeightCompression]];
1978
1979 [[ConstrainedWindowSheetController controllerForParentWindow:[self window]]
1980 updateSheetPosition];
1981 } 1977 }
1982 1978
1983 // (Needed for |BookmarkBarControllerDelegate| protocol.) 1979 // (Needed for |BookmarkBarControllerDelegate| protocol.)
1984 - (void)bookmarkBar:(BookmarkBarController*)controller 1980 - (void)bookmarkBar:(BookmarkBarController*)controller
1985 willAnimateFromState:(BookmarkBar::State)oldState 1981 willAnimateFromState:(BookmarkBar::State)oldState
1986 toState:(BookmarkBar::State)newState { 1982 toState:(BookmarkBar::State)newState {
1987 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; 1983 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
1988 [self adjustToolbarAndBookmarkBarForCompression: 1984 [self adjustToolbarAndBookmarkBarForCompression:
1989 [controller getDesiredToolbarHeightCompression]]; 1985 [controller getDesiredToolbarHeightCompression]];
1990 } 1986 }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2226 2222
2227 - (BOOL)supportsBookmarkBar { 2223 - (BOOL)supportsBookmarkBar {
2228 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2224 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2229 } 2225 }
2230 2226
2231 - (BOOL)isTabbedWindow { 2227 - (BOOL)isTabbedWindow {
2232 return browser_->is_type_tabbed(); 2228 return browser_->is_type_tabbed();
2233 } 2229 }
2234 2230
2235 @end // @implementation BrowserWindowController(WindowType) 2231 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698