| 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 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 - (NSView*)activeTabView { | 1141 - (NSView*)activeTabView { |
| 1142 return [tabStripController_ activeTabView]; | 1142 return [tabStripController_ activeTabView]; |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { | 1145 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { |
| 1146 [toolbarController_ setIsLoading:isLoading force:force]; | 1146 [toolbarController_ setIsLoading:isLoading force:force]; |
| 1147 } | 1147 } |
| 1148 | 1148 |
| 1149 - (BOOL)locationBarHasFocus { |
| 1150 return [toolbarController_ locationBarHasFocus]; |
| 1151 } |
| 1152 |
| 1149 // Make the location bar the first responder, if possible. | 1153 // Make the location bar the first responder, if possible. |
| 1150 - (void)focusLocationBar:(BOOL)selectAll { | 1154 - (void)focusLocationBar:(BOOL)selectAll { |
| 1151 [toolbarController_ focusLocationBar:selectAll]; | 1155 [toolbarController_ focusLocationBar:selectAll]; |
| 1152 } | 1156 } |
| 1153 | 1157 |
| 1154 - (void)focusTabContents { | 1158 - (void)focusTabContents { |
| 1155 content::WebContents* const activeWebContents = | 1159 content::WebContents* const activeWebContents = |
| 1156 browser_->tab_strip_model()->GetActiveWebContents(); | 1160 browser_->tab_strip_model()->GetActiveWebContents(); |
| 1157 if (activeWebContents) | 1161 if (activeWebContents) |
| 1158 activeWebContents->Focus(); | 1162 activeWebContents->Focus(); |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2014 | 2018 |
| 2015 - (NSRect)savedRegularWindowFrame { | 2019 - (NSRect)savedRegularWindowFrame { |
| 2016 return savedRegularWindowFrame_; | 2020 return savedRegularWindowFrame_; |
| 2017 } | 2021 } |
| 2018 | 2022 |
| 2019 - (BOOL)isFullscreenTransitionInProgress { | 2023 - (BOOL)isFullscreenTransitionInProgress { |
| 2020 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2024 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2021 } | 2025 } |
| 2022 | 2026 |
| 2023 @end // @implementation BrowserWindowController(WindowType) | 2027 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |