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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 break; | 626 break; |
627 case IDC_DISTILL_PAGE: | 627 case IDC_DISTILL_PAGE: |
628 DistillCurrentPage(browser_); | 628 DistillCurrentPage(browser_); |
629 break; | 629 break; |
630 #if defined(OS_CHROMEOS) | 630 #if defined(OS_CHROMEOS) |
631 case IDC_TOUCH_HUD_PROJECTION_TOGGLE: | 631 case IDC_TOUCH_HUD_PROJECTION_TOGGLE: |
632 if (chrome::IsRunningInMash()) { | 632 if (chrome::IsRunningInMash()) { |
633 shell::Connector* connector = | 633 shell::Connector* connector = |
634 content::MojoShellConnection::GetForProcess()->GetConnector(); | 634 content::MojoShellConnection::GetForProcess()->GetConnector(); |
635 mash::mojom::LaunchablePtr launchable; | 635 mash::mojom::LaunchablePtr launchable; |
636 connector->ConnectToInterface("mojo:touch_hud", &launchable); | 636 connector->ConnectToInterface("service:touch_hud", &launchable); |
637 launchable->Launch(mash::mojom::kWindow, | 637 launchable->Launch(mash::mojom::kWindow, |
638 mash::mojom::LaunchMode::DEFAULT); | 638 mash::mojom::LaunchMode::DEFAULT); |
639 } else { | 639 } else { |
640 ash::accelerators::ToggleTouchHudProjection(); | 640 ash::accelerators::ToggleTouchHudProjection(); |
641 } | 641 } |
642 break; | 642 break; |
643 #endif | 643 #endif |
644 case IDC_ROUTE_MEDIA: | 644 case IDC_ROUTE_MEDIA: |
645 RouteMedia(browser_); | 645 RouteMedia(browser_); |
646 break; | 646 break; |
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1173 | 1173 |
1174 BrowserWindow* BrowserCommandController::window() { | 1174 BrowserWindow* BrowserCommandController::window() { |
1175 return browser_->window(); | 1175 return browser_->window(); |
1176 } | 1176 } |
1177 | 1177 |
1178 Profile* BrowserCommandController::profile() { | 1178 Profile* BrowserCommandController::profile() { |
1179 return browser_->profile(); | 1179 return browser_->profile(); |
1180 } | 1180 } |
1181 | 1181 |
1182 } // namespace chrome | 1182 } // namespace chrome |
OLD | NEW |