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

Side by Side Diff: ash/mus/accelerators/accelerator_controller_delegate_mus.cc

Issue 2391023002: Two small ash fixes. (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
« no previous file with comments | « no previous file | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 case TAKE_WINDOW_SCREENSHOT: 48 case TAKE_WINDOW_SCREENSHOT:
49 case UNPIN: 49 case UNPIN:
50 NOTIMPLEMENTED(); 50 NOTIMPLEMENTED();
51 return false; 51 return false;
52 52
53 #if defined(OS_CHROMEOS) 53 #if defined(OS_CHROMEOS)
54 case DEV_ADD_REMOVE_DISPLAY: { 54 case DEV_ADD_REMOVE_DISPLAY: {
55 display::mojom::DisplayControllerPtr display_controller; 55 display::mojom::DisplayControllerPtr display_controller;
56 connector_->ConnectToInterface("mojo:ui", &display_controller); 56 connector_->ConnectToInterface("mojo:ui", &display_controller);
57 display_controller->ToggleVirtualDisplay(); 57 display_controller->ToggleVirtualDisplay();
58 break; 58 return true;
59 } 59 }
60 case DEV_TOGGLE_UNIFIED_DESKTOP: 60 case DEV_TOGGLE_UNIFIED_DESKTOP:
61 case DISABLE_GPU_WATCHDOG: 61 case DISABLE_GPU_WATCHDOG:
62 case LOCK_PRESSED: 62 case LOCK_PRESSED:
63 case LOCK_RELEASED: 63 case LOCK_RELEASED:
64 case POWER_PRESSED: 64 case POWER_PRESSED:
65 case POWER_RELEASED: 65 case POWER_RELEASED:
66 case SWAP_PRIMARY_DISPLAY: 66 case SWAP_PRIMARY_DISPLAY:
67 case TOGGLE_MIRROR_MODE: 67 case TOGGLE_MIRROR_MODE:
68 case TOUCH_HUD_CLEAR: 68 case TOUCH_HUD_CLEAR:
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 const char* const notification_id, 102 const char* const notification_id,
103 int message_id, 103 int message_id,
104 int old_shortcut_id, 104 int old_shortcut_id,
105 int new_shortcut_id) { 105 int new_shortcut_id) {
106 // TODO: http://crbug.com/630316. 106 // TODO: http://crbug.com/630316.
107 NOTIMPLEMENTED(); 107 NOTIMPLEMENTED();
108 } 108 }
109 109
110 } // namespace mus 110 } // namespace mus
111 } // namespace ash 111 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698