summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 01:49:17 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 01:49:17 +0000
commit47686c42b6a34d82c12f8f378be8d52d06875404 (patch)
tree68f3cb78f8afb9fae59e221b0ea38e6b16391f3d /ash/shell.h
parent6e415ff81a1e29024ccfdd5548e7cd6ba4de450e (diff)
downloadchromium_src-47686c42b6a34d82c12f8f378be8d52d06875404.zip
chromium_src-47686c42b6a34d82c12f8f378be8d52d06875404.tar.gz
chromium_src-47686c42b6a34d82c12f8f378be8d52d06875404.tar.bz2
Introduces NewWindowDelegate to create or show windows/tabs that are not part of ash.
BUG=none TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/30533012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 74903cb..eb20038 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -89,14 +89,15 @@ class LauncherDelegate;
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;
@@ -371,6 +372,10 @@ class ASH_EXPORT Shell
return accessibility_delegate_.get();
}
+ NewWindowDelegate* new_window_delegate() {
+ return new_window_delegate_.get();
+ }
+
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -579,6 +584,7 @@ class ASH_EXPORT Shell
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_;