Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
diff --git a/ash/shell.h b/ash/shell.h
index 56af8d1..6f88e1d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -51,7 +51,7 @@
namespace ui {
class DisplayConfigurator;
class Layer;
-class UserActivityNotifier;
+class UserActivityPowerManagerNotifier;
}
namespace views {
class NonClientFrameView;
@@ -307,6 +307,9 @@
// Initializes |shelf_|. Does nothing if it's already initialized.
void CreateShelf();
+ // Called when the shelf is created for |root_window|.
+ void OnShelfCreatedForRootWindow(aura::Window* root_window);
+
// Creates a virtual keyboard. Deletes the old virtual keyboard if it already
// exists.
void CreateKeyboard();
@@ -689,7 +692,7 @@
#if defined(OS_CHROMEOS)
scoped_ptr<PowerEventObserver> power_event_observer_;
- scoped_ptr<ui::UserActivityNotifier> user_activity_notifier_;
+ scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
scoped_ptr<StickyKeysController> sticky_keys_controller_;
scoped_ptr<ResolutionNotificationController>