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

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

Issue 2434923002: Handle modified displays in mustash. (Closed)
Patch Set: Fixes after initial review. 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/root_window_controller.h » ('j') | ash/mus/root_window_controller.cc » ('J')
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 #include "services/ui/public/interfaces/display/test_display_controller.mojom.h" 10 #include "services/ui/public/interfaces/display/test_display_controller.mojom.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 case SHOW_SYSTEM_TRAY_BUBBLE: 46 case SHOW_SYSTEM_TRAY_BUBBLE:
47 case TAKE_PARTIAL_SCREENSHOT: 47 case TAKE_PARTIAL_SCREENSHOT:
48 case TAKE_SCREENSHOT: 48 case TAKE_SCREENSHOT:
49 case TAKE_WINDOW_SCREENSHOT: 49 case TAKE_WINDOW_SCREENSHOT:
50 case UNPIN: 50 case UNPIN:
51 NOTIMPLEMENTED(); 51 NOTIMPLEMENTED();
52 return false; 52 return false;
53 53
54 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
55 case DEV_ADD_REMOVE_DISPLAY: 55 case DEV_ADD_REMOVE_DISPLAY:
56 case DEV_TOGGLE_UNIFIED_DESKTOP:
56 case SWAP_PRIMARY_DISPLAY: 57 case SWAP_PRIMARY_DISPLAY:
57 case TOUCH_HUD_PROJECTION_TOGGLE: 58 case TOUCH_HUD_PROJECTION_TOGGLE:
58 return true; 59 return true;
59 case DEV_TOGGLE_UNIFIED_DESKTOP:
60 case LOCK_PRESSED: 60 case LOCK_PRESSED:
61 case LOCK_RELEASED: 61 case LOCK_RELEASED:
62 case POWER_PRESSED: 62 case POWER_PRESSED:
63 case POWER_RELEASED: 63 case POWER_RELEASED:
64 case TOGGLE_MIRROR_MODE: 64 case TOGGLE_MIRROR_MODE:
65 case TOUCH_HUD_CLEAR: 65 case TOUCH_HUD_CLEAR:
66 case TOUCH_HUD_MODE_CHANGE: 66 case TOUCH_HUD_MODE_CHANGE:
67 NOTIMPLEMENTED(); 67 NOTIMPLEMENTED();
68 return false; 68 return false;
69 #endif 69 #endif
70 70
71 default: 71 default:
72 break; 72 break;
73 } 73 }
74 return false; 74 return false;
75 } 75 }
76 76
77 bool AcceleratorControllerDelegateMus::CanPerformAction( 77 bool AcceleratorControllerDelegateMus::CanPerformAction(
78 AcceleratorAction action, 78 AcceleratorAction action,
79 const ui::Accelerator& accelerator, 79 const ui::Accelerator& accelerator,
80 const ui::Accelerator& previous_accelerator) { 80 const ui::Accelerator& previous_accelerator) {
81 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
82 switch (action) { 82 switch (action) {
83 case DEV_ADD_REMOVE_DISPLAY: 83 case DEV_ADD_REMOVE_DISPLAY:
84 case DEV_TOGGLE_UNIFIED_DESKTOP:
84 case SWAP_PRIMARY_DISPLAY: 85 case SWAP_PRIMARY_DISPLAY:
85 case TOUCH_HUD_PROJECTION_TOGGLE: 86 case TOUCH_HUD_PROJECTION_TOGGLE:
86 return true; 87 return true;
87 default: 88 default:
88 break; 89 break;
89 } 90 }
90 #endif 91 #endif
91 return false; 92 return false;
92 } 93 }
93 94
94 void AcceleratorControllerDelegateMus::PerformAction( 95 void AcceleratorControllerDelegateMus::PerformAction(
95 AcceleratorAction action, 96 AcceleratorAction action,
96 const ui::Accelerator& accelerator) { 97 const ui::Accelerator& accelerator) {
97 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
98 switch (action) { 99 switch (action) {
99 case DEV_ADD_REMOVE_DISPLAY: { 100 case DEV_ADD_REMOVE_DISPLAY: {
100 display::mojom::TestDisplayControllerPtr test_display_controller; 101 display::mojom::TestDisplayControllerPtr test_display_controller;
101 connector_->ConnectToInterface("service:ui", &test_display_controller); 102 connector_->ConnectToInterface("service:ui", &test_display_controller);
102 test_display_controller->ToggleAddRemoveDisplay(); 103 test_display_controller->ToggleAddRemoveDisplay();
103 break; 104 break;
104 } 105 }
106 case DEV_TOGGLE_UNIFIED_DESKTOP: {
107 // TODO(kylechar): This is hack. I'm just stealing the shortcut key to
sky 2016/10/19 23:37:59 Please file a bug so we don't forget about it.
kylechar 2016/10/20 15:04:19 Done.
108 // toggle display size in mus. This should be fixed by launch.
109 display::mojom::TestDisplayControllerPtr test_display_controller;
110 connector_->ConnectToInterface("service:ui", &test_display_controller);
111 test_display_controller->ToggleDisplayResolution();
112 break;
113 }
105 case SWAP_PRIMARY_DISPLAY: { 114 case SWAP_PRIMARY_DISPLAY: {
106 display::mojom::DisplayControllerPtr display_controller; 115 display::mojom::DisplayControllerPtr display_controller;
107 connector_->ConnectToInterface("service:ui", &display_controller); 116 connector_->ConnectToInterface("service:ui", &display_controller);
108 display_controller->SwapPrimaryDisplay(); 117 display_controller->SwapPrimaryDisplay();
109 break; 118 break;
110 } 119 }
111 case TOUCH_HUD_PROJECTION_TOGGLE: { 120 case TOUCH_HUD_PROJECTION_TOGGLE: {
112 mash::mojom::LaunchablePtr launchable; 121 mash::mojom::LaunchablePtr launchable;
113 connector_->ConnectToInterface("service:touch_hud", &launchable); 122 connector_->ConnectToInterface("service:touch_hud", &launchable);
114 launchable->Launch(mash::mojom::kWindow, 123 launchable->Launch(mash::mojom::kWindow,
(...skipping 12 matching lines...) Expand all
127 const char* const notification_id, 136 const char* const notification_id,
128 int message_id, 137 int message_id,
129 int old_shortcut_id, 138 int old_shortcut_id,
130 int new_shortcut_id) { 139 int new_shortcut_id) {
131 // TODO: http://crbug.com/630316. 140 // TODO: http://crbug.com/630316.
132 NOTIMPLEMENTED(); 141 NOTIMPLEMENTED();
133 } 142 }
134 143
135 } // namespace mus 144 } // namespace mus
136 } // namespace ash 145 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/mus/root_window_controller.h » ('j') | ash/mus/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698