ash/shell.cc - Issue 236153002: Merge 261317 "Read and expose accelerometer values from cros-ec-..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell.cc

Issue 236153002: Merge 261317 "Read and expose accelerometer values from cros-ec-..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/

Patch Set: Created 6 years, 8 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

Index: ash/shell.cc

===================================================================

--- ash/shell.cc (revision 263397)

+++ ash/shell.cc (working copy)

@@ -11,6 +11,7 @@

#include "ash/accelerators/accelerator_filter.h"

#include "ash/accelerators/focus_manager_factory.h"

#include "ash/accelerators/nested_dispatcher_controller.h"

+#include "ash/accelerometer/accelerometer_controller.h"

#include "ash/ash_switches.h"

#include "ash/autoclick/autoclick_controller.h"

#include "ash/desktop_background/desktop_background_controller.h"

@@ -606,6 +607,7 @@

delegate_(delegate),

window_positioner_(new WindowPositioner),

activation_client_(NULL),

+ accelerometer_controller_(new AccelerometerController()),

#if defined(OS_CHROMEOS) && defined(USE_X11)

output_configurator_(new ui::OutputConfigurator()),

#endif // defined(OS_CHROMEOS) && defined(USE_X11)

« no previous file with comments | « ash/shell.h ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »