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

Side by Side Diff: ash/mus/accelerators/accelerator_controller_delegate_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_delegate_mus.h" 5 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "mash/public/interfaces/launchable.mojom.h" 8 #include "mash/public/interfaces/launchable.mojom.h"
9 #include "services/ui/public/interfaces/display/display_controller.mojom.h" 9 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace mus { 12 namespace mus {
13 13
14 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus( 14 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus(
15 shell::Connector* connector) 15 service_manager::Connector* connector)
16 : connector_(connector) { 16 : connector_(connector) {
17 #if !defined(OS_CHROMEOS) 17 #if !defined(OS_CHROMEOS)
18 // To avoid trybot complaining that |connector_| is not being 18 // To avoid trybot complaining that |connector_| is not being
19 // used in non-ChromeOS. 19 // used in non-ChromeOS.
20 connector_ = nullptr; 20 connector_ = nullptr;
21 #endif 21 #endif
22 } 22 }
23 23
24 AcceleratorControllerDelegateMus::~AcceleratorControllerDelegateMus() {} 24 AcceleratorControllerDelegateMus::~AcceleratorControllerDelegateMus() {}
25 25
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 const char* const notification_id, 101 const char* const notification_id,
102 int message_id, 102 int message_id,
103 int old_shortcut_id, 103 int old_shortcut_id,
104 int new_shortcut_id) { 104 int new_shortcut_id) {
105 // TODO: http://crbug.com/630316. 105 // TODO: http://crbug.com/630316.
106 NOTIMPLEMENTED(); 106 NOTIMPLEMENTED();
107 } 107 }
108 108
109 } // namespace mus 109 } // namespace mus
110 } // namespace ash 110 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.h ('k') | ash/mus/accelerators/accelerator_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698