| 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 #include "chrome/browser/ui/browser_command_controller.h" | 5 #include "chrome/browser/ui/browser_command_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 break; | 616 break; |
| 617 case IDC_SHOW_SIGNIN: | 617 case IDC_SHOW_SIGNIN: |
| 618 ShowBrowserSigninOrSettings( | 618 ShowBrowserSigninOrSettings( |
| 619 browser_, signin_metrics::AccessPoint::ACCESS_POINT_MENU); | 619 browser_, signin_metrics::AccessPoint::ACCESS_POINT_MENU); |
| 620 break; | 620 break; |
| 621 case IDC_DISTILL_PAGE: | 621 case IDC_DISTILL_PAGE: |
| 622 DistillCurrentPage(browser_); | 622 DistillCurrentPage(browser_); |
| 623 break; | 623 break; |
| 624 #if defined(OS_CHROMEOS) | 624 #if defined(OS_CHROMEOS) |
| 625 case IDC_TOUCH_HUD_PROJECTION_TOGGLE: | 625 case IDC_TOUCH_HUD_PROJECTION_TOGGLE: |
| 626 if (ash_util::IsRunningInMash()) { | 626 if (IsRunningInMash()) { |
| 627 service_manager::Connector* connector = | 627 service_manager::Connector* connector = |
| 628 content::ServiceManagerConnection::GetForProcess()->GetConnector(); | 628 content::ServiceManagerConnection::GetForProcess()->GetConnector(); |
| 629 mash::mojom::LaunchablePtr launchable; | 629 mash::mojom::LaunchablePtr launchable; |
| 630 connector->BindInterface("touch_hud", &launchable); | 630 connector->BindInterface("touch_hud", &launchable); |
| 631 launchable->Launch(mash::mojom::kWindow, | 631 launchable->Launch(mash::mojom::kWindow, |
| 632 mash::mojom::LaunchMode::DEFAULT); | 632 mash::mojom::LaunchMode::DEFAULT); |
| 633 } else { | 633 } else { |
| 634 ash::accelerators::ToggleTouchHudProjection(); | 634 ash::accelerators::ToggleTouchHudProjection(); |
| 635 } | 635 } |
| 636 break; | 636 break; |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 | 1152 |
| 1153 BrowserWindow* BrowserCommandController::window() { | 1153 BrowserWindow* BrowserCommandController::window() { |
| 1154 return browser_->window(); | 1154 return browser_->window(); |
| 1155 } | 1155 } |
| 1156 | 1156 |
| 1157 Profile* BrowserCommandController::profile() { | 1157 Profile* BrowserCommandController::profile() { |
| 1158 return browser_->profile(); | 1158 return browser_->profile(); |
| 1159 } | 1159 } |
| 1160 | 1160 |
| 1161 } // namespace chrome | 1161 } // namespace chrome |
| OLD | NEW |