| 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 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 Browser* newBrowser = browser_->tab_strip_model()->delegate()-> | 1346 Browser* newBrowser = browser_->tab_strip_model()->delegate()-> |
| 1347 CreateNewStripWithContents(contents, browserRect, dockInfo, false); | 1347 CreateNewStripWithContents(contents, browserRect, dockInfo, false); |
| 1348 | 1348 |
| 1349 // Propagate the tab pinned state of the new tab (which is the only tab in | 1349 // Propagate the tab pinned state of the new tab (which is the only tab in |
| 1350 // this new window). | 1350 // this new window). |
| 1351 newBrowser->tab_strip_model()->SetTabPinned(0, isPinned); | 1351 newBrowser->tab_strip_model()->SetTabPinned(0, isPinned); |
| 1352 | 1352 |
| 1353 // Get the new controller by asking the new window for its delegate. | 1353 // Get the new controller by asking the new window for its delegate. |
| 1354 BrowserWindowController* controller = | 1354 BrowserWindowController* controller = |
| 1355 reinterpret_cast<BrowserWindowController*>( | 1355 reinterpret_cast<BrowserWindowController*>( |
| 1356 [newBrowser->window()->GetNativeHandle() delegate]); | 1356 [newBrowser->window()->GetNativeWindow() delegate]); |
| 1357 DCHECK(controller && [controller isKindOfClass:[TabWindowController class]]); | 1357 DCHECK(controller && [controller isKindOfClass:[TabWindowController class]]); |
| 1358 | 1358 |
| 1359 // Force the added tab to the right size (remove stretching.) | 1359 // Force the added tab to the right size (remove stretching.) |
| 1360 tabRect.size.height = [TabStripController defaultTabHeight]; | 1360 tabRect.size.height = [TabStripController defaultTabHeight]; |
| 1361 | 1361 |
| 1362 // And make sure we use the correct frame in the new view. | 1362 // And make sure we use the correct frame in the new view. |
| 1363 [[controller tabStripController] setFrameOfActiveTab:tabRect]; | 1363 [[controller tabStripController] setFrameOfActiveTab:tabRect]; |
| 1364 return controller; | 1364 return controller; |
| 1365 } | 1365 } |
| 1366 | 1366 |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2222 | 2222 |
| 2223 - (BOOL)supportsBookmarkBar { | 2223 - (BOOL)supportsBookmarkBar { |
| 2224 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2224 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2225 } | 2225 } |
| 2226 | 2226 |
| 2227 - (BOOL)isTabbedWindow { | 2227 - (BOOL)isTabbedWindow { |
| 2228 return browser_->is_type_tabbed(); | 2228 return browser_->is_type_tabbed(); |
| 2229 } | 2229 } |
| 2230 | 2230 |
| 2231 @end // @implementation BrowserWindowController(WindowType) | 2231 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |