diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 19:21:16 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 19:21:16 +0000 |
| commit | 1467617015bae6becd7a2a11a22f417f3fde0ec3 (patch) | |
| tree | 3749c49ca65f141b3effaa1c39f02cd39804209d /ash/shell_delegate.h | |
| parent | f80e2c9d07b4dc00b0e4ea8e7d458f1468c2ea2a (diff) | |
| download | chromium_src-1467617015bae6becd7a2a11a22f417f3fde0ec3.zip chromium_src-1467617015bae6becd7a2a11a22f417f3fde0ec3.tar.gz chromium_src-1467617015bae6becd7a2a11a22f417f3fde0ec3.tar.bz2 | |
Revert 167431 - reland of https://codereview.chromium.org/11364053/
Two changes from that CL:
- Don't remove per-RootWindow StackingClient (erg thought he probably needed it; if not I can remove it later in a separate CL)
- Fix initialization in Shell::PlatformInitialize (wasn't initializing correctly in the CrOS case), diff between ps1 and ps2 in content/shell/shell_aura.cc
TBR=ben@chromium.org
BUG=128578
Review URL: https://codereview.chromium.org/11362216
TBR=scottmg@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_delegate.h')
| -rw-r--r-- | ash/shell_delegate.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h index 6f3c7f3..5f69459 100644 --- a/ash/shell_delegate.h +++ b/ash/shell_delegate.h @@ -21,7 +21,6 @@ namespace aura { class RootWindow; class Window; namespace client { -class StackingClient; class UserActionClient; } } @@ -182,9 +181,6 @@ class ASH_EXPORT ShellDelegate { // Creates a menu model of the context for the |root_window|. virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root_window) = 0; - - // Creates the stacking client. Shell takes ownership of the object. - virtual aura::client::StackingClient* CreateStackingClient() = 0; }; } // namespace ash |