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

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

Issue 10736028: Refactor browser window zoom handling and enable zoom icon on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
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.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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 - (void)updateToolbarWithContents:(WebContents*)tab 1190 - (void)updateToolbarWithContents:(WebContents*)tab
1191 shouldRestoreState:(BOOL)shouldRestore { 1191 shouldRestoreState:(BOOL)shouldRestore {
1192 [toolbarController_ updateToolbarWithContents:tab 1192 [toolbarController_ updateToolbarWithContents:tab
1193 shouldRestoreState:shouldRestore]; 1193 shouldRestoreState:shouldRestore];
1194 } 1194 }
1195 1195
1196 - (void)setStarredState:(BOOL)isStarred { 1196 - (void)setStarredState:(BOOL)isStarred {
1197 [toolbarController_ setStarredState:isStarred]; 1197 [toolbarController_ setStarredState:isStarred];
1198 } 1198 }
1199 1199
1200 - (void)zoomChangedForActiveTab:(BOOL)canShowBubble {
1201 [toolbarController_ zoomChangedForActiveTab:canShowBubble];
1202 }
1203
1200 // Return the rect, in WebKit coordinates (flipped), of the window's grow box 1204 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
1201 // in the coordinate system of the content area of the currently selected tab. 1205 // in the coordinate system of the content area of the currently selected tab.
1202 // |windowGrowBox| needs to be in the window's coordinate system. 1206 // |windowGrowBox| needs to be in the window's coordinate system.
1203 - (NSRect)selectedTabGrowBoxRect { 1207 - (NSRect)selectedTabGrowBoxRect {
1204 NSWindow* window = [self window]; 1208 NSWindow* window = [self window];
1205 if (![window respondsToSelector:@selector(_growBoxRect)]) 1209 if (![window respondsToSelector:@selector(_growBoxRect)])
1206 return NSZeroRect; 1210 return NSZeroRect;
1207 1211
1208 // Before we return a rect, we need to convert it from window coordinates 1212 // Before we return a rect, we need to convert it from window coordinates
1209 // to tab content area coordinates and flip the coordinate system. 1213 // to tab content area coordinates and flip the coordinate system.
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
2213 2217
2214 - (BOOL)supportsBookmarkBar { 2218 - (BOOL)supportsBookmarkBar {
2215 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2219 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2216 } 2220 }
2217 2221
2218 - (BOOL)isTabbedWindow { 2222 - (BOOL)isTabbedWindow {
2219 return browser_->is_type_tabbed(); 2223 return browser_->is_type_tabbed();
2220 } 2224 }
2221 2225
2222 @end // @implementation BrowserWindowController(WindowType) 2226 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698