| OLD | NEW | 
|---|
| 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 #include <utility> | 9 #include <utility> | 
| 10 | 10 | 
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 432       [toolbarController_ createBrowserActionButtons]; | 432       [toolbarController_ createBrowserActionButtons]; | 
| 433 | 433 | 
| 434     extension_keybinding_registry_.reset( | 434     extension_keybinding_registry_.reset( | 
| 435         new ExtensionKeybindingRegistryCocoa(browser_->profile(), | 435         new ExtensionKeybindingRegistryCocoa(browser_->profile(), | 
| 436             [self window], | 436             [self window], | 
| 437             extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, | 437             extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, | 
| 438             windowShim_.get())); | 438             windowShim_.get())); | 
| 439 | 439 | 
| 440     PrefService* prefs = browser_->profile()->GetPrefs(); | 440     PrefService* prefs = browser_->profile()->GetPrefs(); | 
| 441     shouldHideFullscreenToolbar_ = | 441     shouldHideFullscreenToolbar_ = | 
| 442         prefs->GetBoolean(prefs::kHideFullscreenToolbar); | 442         !prefs->GetBoolean(prefs::kShowFullscreenToolbar); | 
| 443 |  | 
| 444     blockLayoutSubviews_ = NO; | 443     blockLayoutSubviews_ = NO; | 
| 445 | 444 | 
| 446     // We are done initializing now. | 445     // We are done initializing now. | 
| 447     initializing_ = NO; | 446     initializing_ = NO; | 
| 448   } | 447   } | 
| 449   return self; | 448   return self; | 
| 450 } | 449 } | 
| 451 | 450 | 
| 452 - (void)dealloc { | 451 - (void)dealloc { | 
| 453   browser_->tab_strip_model()->CloseAllTabs(); | 452   browser_->tab_strip_model()->CloseAllTabs(); | 
| (...skipping 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2143 | 2142 | 
| 2144 - (BOOL)supportsBookmarkBar { | 2143 - (BOOL)supportsBookmarkBar { | 
| 2145   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2144   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 
| 2146 } | 2145 } | 
| 2147 | 2146 | 
| 2148 - (BOOL)isTabbedWindow { | 2147 - (BOOL)isTabbedWindow { | 
| 2149   return browser_->is_type_tabbed(); | 2148   return browser_->is_type_tabbed(); | 
| 2150 } | 2149 } | 
| 2151 | 2150 | 
| 2152 @end  // @implementation BrowserWindowController(WindowType) | 2151 @end  // @implementation BrowserWindowController(WindowType) | 
| OLD | NEW | 
|---|