Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 case IDC_SHOW_SIGNIN: 623 case IDC_SHOW_SIGNIN:
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 service_manager::Connector* connector =
634 content::ServiceManagerConnection::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
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698