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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "components/dom_distiller/core/dom_distiller_switches.h" | 46 #include "components/dom_distiller/core/dom_distiller_switches.h" |
47 #include "components/prefs/pref_service.h" | 47 #include "components/prefs/pref_service.h" |
48 #include "components/sessions/core/tab_restore_service.h" | 48 #include "components/sessions/core/tab_restore_service.h" |
49 #include "components/signin/core/common/signin_pref_names.h" | 49 #include "components/signin/core/common/signin_pref_names.h" |
50 #include "content/public/browser/native_web_keyboard_event.h" | 50 #include "content/public/browser/native_web_keyboard_event.h" |
51 #include "content/public/browser/navigation_controller.h" | 51 #include "content/public/browser/navigation_controller.h" |
52 #include "content/public/browser/navigation_entry.h" | 52 #include "content/public/browser/navigation_entry.h" |
53 #include "content/public/browser/user_metrics.h" | 53 #include "content/public/browser/user_metrics.h" |
54 #include "content/public/browser/web_contents.h" | 54 #include "content/public/browser/web_contents.h" |
55 #include "content/public/browser/web_contents_observer.h" | 55 #include "content/public/browser/web_contents_observer.h" |
56 #include "content/public/common/mojo_shell_connection.h" | 56 #include "content/public/common/service_manager_connection.h" |
57 #include "content/public/common/url_constants.h" | 57 #include "content/public/common/url_constants.h" |
58 #include "extensions/browser/extension_system.h" | 58 #include "extensions/browser/extension_system.h" |
59 #include "mash/public/interfaces/launchable.mojom.h" | 59 #include "mash/public/interfaces/launchable.mojom.h" |
60 #include "services/shell/public/cpp/connector.h" | 60 #include "services/shell/public/cpp/connector.h" |
61 #include "ui/events/keycodes/keyboard_codes.h" | 61 #include "ui/events/keycodes/keyboard_codes.h" |
62 | 62 |
63 #if defined(OS_MACOSX) | 63 #if defined(OS_MACOSX) |
64 #include "chrome/browser/ui/browser_commands_mac.h" | 64 #include "chrome/browser/ui/browser_commands_mac.h" |
65 #endif | 65 #endif |
66 | 66 |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 ShowBrowserSigninOrSettings( | 624 ShowBrowserSigninOrSettings( |
625 browser_, signin_metrics::AccessPoint::ACCESS_POINT_MENU); | 625 browser_, signin_metrics::AccessPoint::ACCESS_POINT_MENU); |
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::ServiceManagerConnection::GetForProcess()->GetConnector(); |
635 mash::mojom::LaunchablePtr launchable; | 635 mash::mojom::LaunchablePtr launchable; |
636 connector->ConnectToInterface("service: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: |
(...skipping 528 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 |