| 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 #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 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 927 } | 927 } |
| 928 | 928 |
| 929 frame.size.height = height; | 929 frame.size.height = height; |
| 930 // TODO(rohitrao): Determine if calling setFrame: twice is bad. | 930 // TODO(rohitrao): Determine if calling setFrame: twice is bad. |
| 931 [view setFrame:frame]; | 931 [view setFrame:frame]; |
| 932 [self layoutSubviews]; | 932 [self layoutSubviews]; |
| 933 | 933 |
| 934 if (resizeRectDirty) { | 934 if (resizeRectDirty) { |
| 935 // Send new resize rect to foreground tab. | 935 // Send new resize rect to foreground tab. |
| 936 if (content::WebContents* contents = browser_->GetSelectedWebContents()) { | 936 if (content::WebContents* contents = browser_->GetSelectedWebContents()) { |
| 937 if (RenderViewHost* rvh = contents->GetRenderViewHost()) { | 937 if (content::RenderViewHost* rvh = contents->GetRenderViewHost()) { |
| 938 rvh->ResizeRectChanged(windowShim_->GetRootWindowResizerRect()); | 938 rvh->ResizeRectChanged(windowShim_->GetRootWindowResizerRect()); |
| 939 } | 939 } |
| 940 } | 940 } |
| 941 } | 941 } |
| 942 } | 942 } |
| 943 | 943 |
| 944 - (void)setAnimationInProgress:(BOOL)inProgress { | 944 - (void)setAnimationInProgress:(BOOL)inProgress { |
| 945 [[self tabContentArea] setFastResizeMode:inProgress]; | 945 [[self tabContentArea] setFastResizeMode:inProgress]; |
| 946 } | 946 } |
| 947 | 947 |
| (...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2167 | 2167 |
| 2168 - (BOOL)supportsBookmarkBar { | 2168 - (BOOL)supportsBookmarkBar { |
| 2169 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2169 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2170 } | 2170 } |
| 2171 | 2171 |
| 2172 - (BOOL)isTabbedWindow { | 2172 - (BOOL)isTabbedWindow { |
| 2173 return browser_->is_type_tabbed(); | 2173 return browser_->is_type_tabbed(); |
| 2174 } | 2174 } |
| 2175 | 2175 |
| 2176 @end // @implementation BrowserWindowController(WindowType) | 2176 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |