| 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 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ |
| 7 | 7 |
| 8 // A class acting as the Objective-C controller for the Browser | 8 // A class acting as the Objective-C controller for the Browser |
| 9 // object. Handles interactions between Cocoa and the cross-platform | 9 // object. Handles interactions between Cocoa and the cross-platform |
| 10 // code. Each window has a single toolbar and, by virtue of being a | 10 // code. Each window has a single toolbar and, by virtue of being a |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 // away from the bottom/top or resized (or zoomed). | 101 // away from the bottom/top or resized (or zoomed). |
| 102 CGFloat windowTopGrowth_; | 102 CGFloat windowTopGrowth_; |
| 103 CGFloat windowBottomGrowth_; | 103 CGFloat windowBottomGrowth_; |
| 104 | 104 |
| 105 // YES only if we're shrinking the window from an apparent zoomed state (which | 105 // YES only if we're shrinking the window from an apparent zoomed state (which |
| 106 // we'll only do if we grew it to the zoomed state); needed since we'll then | 106 // we'll only do if we grew it to the zoomed state); needed since we'll then |
| 107 // restrict the amount of shrinking by the amounts specified above. Reset to | 107 // restrict the amount of shrinking by the amounts specified above. Reset to |
| 108 // NO on growth. | 108 // NO on growth. |
| 109 BOOL isShrinkingFromZoomed_; | 109 BOOL isShrinkingFromZoomed_; |
| 110 | 110 |
| 111 // The raw accumulated zoom value and the actual zoom increments made for an | |
| 112 // an in-progress pinch gesture. | |
| 113 CGFloat totalMagnifyGestureAmount_; | |
| 114 NSInteger currentZoomStepDelta_; | |
| 115 | |
| 116 // The view controller that manages the incognito badge or the multi-profile | 111 // The view controller that manages the incognito badge or the multi-profile |
| 117 // avatar button. Depending on whether the --new-profile-management flag is | 112 // avatar button. Depending on whether the --new-profile-management flag is |
| 118 // used, the multi-profile button can either be the avatar's icon badge or a | 113 // used, the multi-profile button can either be the avatar's icon badge or a |
| 119 // button with the profile's name. If the flag is used, the button is always | 114 // button with the profile's name. If the flag is used, the button is always |
| 120 // shown, otherwise the view will always be in the view hierarchy but will | 115 // shown, otherwise the view will always be in the view hierarchy but will |
| 121 // be hidden unless it's appropriate to show it (i.e. if there's more than | 116 // be hidden unless it's appropriate to show it (i.e. if there's more than |
| 122 // one profile). | 117 // one profile). |
| 123 base::scoped_nsobject<AvatarBaseController> avatarButtonController_; | 118 base::scoped_nsobject<AvatarBaseController> avatarButtonController_; |
| 124 | 119 |
| 125 // Lazily created view which draws the background for the floating set of bars | 120 // Lazily created view which draws the background for the floating set of bars |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 // positioned relative to. | 527 // positioned relative to. |
| 533 - (NSRect)omniboxPopupAnchorRect; | 528 - (NSRect)omniboxPopupAnchorRect; |
| 534 | 529 |
| 535 // Force a layout of info bars. | 530 // Force a layout of info bars. |
| 536 - (void)layoutInfoBars; | 531 - (void)layoutInfoBars; |
| 537 | 532 |
| 538 @end // @interface BrowserWindowController (TestingAPI) | 533 @end // @interface BrowserWindowController (TestingAPI) |
| 539 | 534 |
| 540 | 535 |
| 541 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ | 536 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ |
| OLD | NEW |