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

Side by Side Diff: ash/accelerators/accelerator_controller_delegate_aura.cc

Issue 2423673002: [Merge to M55] Fix regression in handling toggle mirror mode (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 | no next file » | 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/accelerators/accelerator_controller_delegate_aura.h" 5 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 case ROTATE_WINDOW: 352 case ROTATE_WINDOW:
353 case SHOW_SYSTEM_TRAY_BUBBLE: 353 case SHOW_SYSTEM_TRAY_BUBBLE:
354 case TAKE_PARTIAL_SCREENSHOT: 354 case TAKE_PARTIAL_SCREENSHOT:
355 case TAKE_SCREENSHOT: 355 case TAKE_SCREENSHOT:
356 case TAKE_WINDOW_SCREENSHOT: 356 case TAKE_WINDOW_SCREENSHOT:
357 return true; 357 return true;
358 358
359 #if defined(OS_CHROMEOS) 359 #if defined(OS_CHROMEOS)
360 case DEV_ADD_REMOVE_DISPLAY: 360 case DEV_ADD_REMOVE_DISPLAY:
361 case DEV_TOGGLE_UNIFIED_DESKTOP: 361 case DEV_TOGGLE_UNIFIED_DESKTOP:
362 case TOGGLE_MIRROR_MODE:
363 return debug::DeveloperAcceleratorsEnabled(); 362 return debug::DeveloperAcceleratorsEnabled();
364 363
365 case SWAP_PRIMARY_DISPLAY: 364 case SWAP_PRIMARY_DISPLAY:
366 return display::Screen::GetScreen()->GetNumDisplays() > 1; 365 return display::Screen::GetScreen()->GetNumDisplays() > 1;
367 case TOUCH_HUD_CLEAR: 366 case TOUCH_HUD_CLEAR:
368 case TOUCH_HUD_MODE_CHANGE: 367 case TOUCH_HUD_MODE_CHANGE:
369 return CanHandleTouchHud(); 368 return CanHandleTouchHud();
370 369
371 // Following are always enabled. 370 // Following are always enabled.
372 case DISABLE_GPU_WATCHDOG: 371 case DISABLE_GPU_WATCHDOG:
373 case LOCK_PRESSED: 372 case LOCK_PRESSED:
374 case LOCK_RELEASED: 373 case LOCK_RELEASED:
375 case POWER_PRESSED: 374 case POWER_PRESSED:
376 case POWER_RELEASED: 375 case POWER_RELEASED:
376 case TOGGLE_MIRROR_MODE:
377 case TOUCH_HUD_PROJECTION_TOGGLE: 377 case TOUCH_HUD_PROJECTION_TOGGLE:
378 return true; 378 return true;
379 #endif 379 #endif
380 380
381 default: 381 default:
382 NOTREACHED(); 382 NOTREACHED();
383 break; 383 break;
384 } 384 }
385 return false; 385 return false;
386 } 386 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 message_center::NotifierId( 506 message_center::NotifierId(
507 message_center::NotifierId::SYSTEM_COMPONENT, 507 message_center::NotifierId::SYSTEM_COMPONENT,
508 system_notifier::kNotifierDeprecatedAccelerator), 508 system_notifier::kNotifierDeprecatedAccelerator),
509 message_center::RichNotificationData(), 509 message_center::RichNotificationData(),
510 new DeprecatedAcceleratorNotificationDelegate)); 510 new DeprecatedAcceleratorNotificationDelegate));
511 message_center::MessageCenter::Get()->AddNotification( 511 message_center::MessageCenter::Get()->AddNotification(
512 std::move(notification)); 512 std::move(notification));
513 } 513 }
514 514
515 } // namespace ash 515 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698