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

Unified Diff: athena/main/athena_launcher.cc

Issue 687533002: Print activity state when Ctrl+Shift+Alt+W is pressed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move debug accelerators to DebugAcceleratorHandler Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index b31f53c8ca5327030c1e340f37a782ebf25bc8b9..6ac68cbf9f2ec63f86e395baba29090c62475746 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -16,6 +16,7 @@
#include "athena/home/public/search_controller_factory.h"
#include "athena/input/public/input_manager.h"
#include "athena/main/athena_views_delegate.h"
+#include "athena/main/debug_accelerator_handler.h"
#include "athena/main/placeholder.h"
#include "athena/main/placeholder.h"
#include "athena/resource_manager/public/resource_manager.h"
@@ -59,6 +60,7 @@ class VirtualKeyboardObserver;
struct AthenaEnvState {
scoped_ptr< ::wm::VisibilityController> visibility_client;
scoped_ptr<VirtualKeyboardObserver> virtual_keyboard_observer;
+ scoped_ptr<DebugAcceleratorHandler> debug_accelerator_handler;
};
DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::AthenaEnvState,
@@ -120,6 +122,9 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_runner) {
athena::AppRegistry::Create();
SetupBackgroundImage();
+ env_state->debug_accelerator_handler.reset(
+ new DebugAcceleratorHandler(root_window));
+
athena::ScreenManager::Get()->GetContext()->SetProperty(
kAthenaEnvStateKey, env_state);
}
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698