Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
diff --git a/ash/shell.h b/ash/shell.h
index af884f4..62379ac 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -16,6 +16,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "ui/aura/client/activation_change_observer.h"
#include "ui/base/ui_base_types.h"
@@ -76,6 +77,7 @@
namespace ash {
class AcceleratorController;
+class AccessibilityDelegate;
class AshNativeCursorManager;
class AutoclickController;
class CapsLockDelegate;
@@ -88,14 +90,15 @@
class LauncherItemDelegate;
class LauncherItemDelegateManager;
class LauncherModel;
+class LockStateController;
class MagnificationController;
class MruWindowTracker;
class NestedDispatcherController;
+class NewWindowDelegate;
class PartialMagnificationController;
class PowerButtonController;
class RootWindowHostFactory;
class ScreenAsh;
-class LockStateController;
class SessionStateDelegate;
class ShellDelegate;
class ShellObserver;
@@ -189,16 +192,16 @@
// TODO(oshima): move this to |RootWindowController|
static RootWindowControllerList GetAllRootWindowControllers();
- // Returns the primary RootWindow. The primary RootWindow is the one
- // that has a launcher.
- static aura::RootWindow* GetPrimaryRootWindow();
+ // Returns the primary root Window. The primary root Window is the one that
+ // has a launcher.
+ static aura::Window* GetPrimaryRootWindow();
- // Returns a RootWindow when used as a target when creating a new window.
+ // Returns a root Window when used as a target when creating a new window.
// The root window of the active window is used in most cases, but can
// be overridden by using ScopedTargetRootWindow().
- // If you want to get a RootWindow of the active window, just use
+ // If you want to get the root Window of the active window, just use
// |wm::GetActiveWindow()->GetRootWindow()|.
- static aura::RootWindow* GetTargetRootWindow();
+ static aura::Window* GetTargetRootWindow();
// Returns the global Screen object that's always active in ash.
static gfx::Screen* GetScreen();
@@ -206,9 +209,9 @@
// Returns all root windows.
static RootWindowList GetAllRootWindows();
- static aura::Window* GetContainer(aura::RootWindow* root_window,
+ static aura::Window* GetContainer(aura::Window* root_window,
int container_id);
- static const aura::Window* GetContainer(const aura::RootWindow* root_window,
+ static const aura::Window* GetContainer(const aura::Window* root_window,
int container_id);
// Returns the list of containers that match |container_id| in
@@ -216,9 +219,9 @@
// in the |priority_root| will be inserted at the top of the list.
static std::vector<aura::Window*> GetContainersFromAllRootWindows(
int container_id,
- aura::RootWindow* priority_root);
+ aura::Window* priority_root);
- void set_target_root_window(aura::RootWindow* target_root_window) {
+ void set_target_root_window(aura::Window* target_root_window) {
target_root_window_ = target_root_window;
}
@@ -366,6 +369,14 @@
return session_state_delegate_.get();
}
+ AccessibilityDelegate* accessibility_delegate() {
+ return accessibility_delegate_.get();
+ }
+
+ NewWindowDelegate* new_window_delegate() {
+ return new_window_delegate_.get();
+ }
+
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -400,14 +411,14 @@
// Sets/gets the shelf auto-hide behavior on |root_window|.
void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
- aura::RootWindow* root_window);
+ aura::Window* root_window);
ShelfAutoHideBehavior GetShelfAutoHideBehavior(
- aura::RootWindow* root_window) const;
+ aura::Window* root_window) const;
// Sets/gets shelf's alignment on |root_window|.
void SetShelfAlignment(ShelfAlignment alignment,
- aura::RootWindow* root_window);
- ShelfAlignment GetShelfAlignment(aura::RootWindow* root_window);
+ aura::Window* root_window);
+ ShelfAlignment GetShelfAlignment(aura::Window* root_window);
// Dims or undims the screen.
void SetDimming(bool should_dim);
@@ -415,7 +426,7 @@
// Notifies |observers_| when entering or exiting fullscreen mode in
// |root_window|.
void NotifyFullscreenStateChange(bool is_fullscreen,
- aura::RootWindow* root_window);
+ aura::Window* root_window);
// Creates a modal background (a partially-opaque fullscreen window)
// on all displays for |window|.
@@ -556,8 +567,8 @@
// created on |scoped_target_root_window_| , unless NULL in
// which case they are created on |target_root_window_|.
// |target_root_window_| never becomes NULL during the session.
- aura::RootWindow* target_root_window_;
- aura::RootWindow* scoped_target_root_window_;
+ aura::Window* target_root_window_;
+ aura::Window* scoped_target_root_window_;
// The CompoundEventFilter owned by aura::Env object.
scoped_ptr<views::corewm::CompoundEventFilter> env_filter_;
@@ -573,6 +584,8 @@
scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
scoped_ptr<SessionStateDelegate> session_state_delegate_;
+ scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
+ scoped_ptr<NewWindowDelegate> new_window_delegate_;
scoped_ptr<LauncherDelegate> launcher_delegate_;
scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
@@ -633,6 +646,8 @@
scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
scoped_ptr<internal::DisplayManager> display_manager_;
+ scoped_ptr<base::WeakPtrFactory<internal::DisplayManager> >
+ weak_display_manager_factory_;
scoped_ptr<internal::LocaleNotificationController>
locale_notification_controller_;