| 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 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2019 | 2019 |
| 2020 - (void)executeExtensionCommand:(const std::string&)extension_id | 2020 - (void)executeExtensionCommand:(const std::string&)extension_id |
| 2021 command:(const extensions::Command&)command { | 2021 command:(const extensions::Command&)command { |
| 2022 // Global commands are handled by the ExtensionCommandsGlobalRegistry | 2022 // Global commands are handled by the ExtensionCommandsGlobalRegistry |
| 2023 // instance. | 2023 // instance. |
| 2024 DCHECK(!command.global()); | 2024 DCHECK(!command.global()); |
| 2025 extension_keybinding_registry_->ExecuteCommand(extension_id, | 2025 extension_keybinding_registry_->ExecuteCommand(extension_id, |
| 2026 command.accelerator()); | 2026 command.accelerator()); |
| 2027 } | 2027 } |
| 2028 | 2028 |
| 2029 - (void)activatePageAction:(const std::string&)extension_id { | |
| 2030 [toolbarController_ activatePageAction:extension_id]; | |
| 2031 } | |
| 2032 | |
| 2033 - (void)activateBrowserAction:(const std::string&)extension_id { | |
| 2034 [toolbarController_ activateBrowserAction:extension_id]; | |
| 2035 } | |
| 2036 | |
| 2037 @end // @implementation BrowserWindowController | 2029 @end // @implementation BrowserWindowController |
| 2038 | 2030 |
| 2039 | 2031 |
| 2040 @implementation BrowserWindowController(Fullscreen) | 2032 @implementation BrowserWindowController(Fullscreen) |
| 2041 | 2033 |
| 2042 - (void)handleLionToggleFullscreen { | 2034 - (void)handleLionToggleFullscreen { |
| 2043 DCHECK(base::mac::IsOSLionOrLater()); | 2035 DCHECK(base::mac::IsOSLionOrLater()); |
| 2044 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN); | 2036 chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN); |
| 2045 } | 2037 } |
| 2046 | 2038 |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2274 | 2266 |
| 2275 - (BOOL)supportsBookmarkBar { | 2267 - (BOOL)supportsBookmarkBar { |
| 2276 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2268 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2277 } | 2269 } |
| 2278 | 2270 |
| 2279 - (BOOL)isTabbedWindow { | 2271 - (BOOL)isTabbedWindow { |
| 2280 return browser_->is_type_tabbed(); | 2272 return browser_->is_type_tabbed(); |
| 2281 } | 2273 } |
| 2282 | 2274 |
| 2283 @end // @implementation BrowserWindowController(WindowType) | 2275 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |