Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/ash/shell.h b/ash/shell.h
index f8649dc..a602cdf 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -462,6 +462,12 @@
// Returns the launcher delegate, creating if necesary.
LauncherDelegate* GetLauncherDelegate();
+ void SetTouchHudProjectionEnabled(bool enabled);
+
+ bool is_touch_hud_projection_enabled() const {
+ return is_touch_hud_projection_enabled_;
+ }
+
private:
FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
@@ -479,8 +485,10 @@
void Init();
// Initializes the root window and root window controller so that it
- // can host browser windows.
- void InitRootWindowController(internal::RootWindowController* root);
+ // can host browser windows. |first_run_after_boot| is true for the
+ // primary display only first time after boot.
+ void InitRootWindowController(internal::RootWindowController* root,
+ bool first_run_after_boot);
// ash::internal::SystemModalContainerEventFilterDelegate overrides:
virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE;
@@ -604,6 +612,8 @@
// For testing only: simulate that a modal window is open
bool simulate_modal_window_open_for_testing_;
+ bool is_touch_hud_projection_enabled_;
+
DISALLOW_COPY_AND_ASSIGN(Shell);
};