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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 9662022: Basic skeleton of a window/layer/view inspector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | ui/oak/oak.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
===================================================================
--- ash/accelerators/accelerator_controller.cc (revision 125863)
+++ ash/accelerators/accelerator_controller.cc (working copy)
@@ -5,6 +5,7 @@
#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_table.h"
+#include "ash/ash_switches.h"
#include "ash/caps_lock_delegate.h"
#include "ash/ime_control_delegate.h"
#include "ash/launcher/launcher.h"
@@ -17,6 +18,7 @@
#include "ash/volume_control_delegate.h"
#include "ash/wm/window_cycle_controller.h"
#include "ash/wm/window_util.h"
+#include "base/command_line.h"
#include "ui/aura/event.h"
#include "ui/aura/root_window.h"
#include "ui/base/accelerators/accelerator.h"
@@ -25,6 +27,7 @@
#include "ui/gfx/compositor/layer_animation_sequence.h"
#include "ui/gfx/compositor/layer_animator.h"
#include "ui/gfx/compositor/screen_rotation.h"
+#include "ui/oak/oak.h"
namespace {
@@ -260,6 +263,10 @@
if (volume_control_delegate_.get())
return volume_control_delegate_->HandleVolumeUp(accelerator);
break;
+ case SHOW_OAK:
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshEnableOak))
+ oak::ShowOakWindow();
+ break;
case NEXT_IME:
if (ime_control_delegate_.get())
return ime_control_delegate_->HandleNextIme();
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | ui/oak/oak.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698