diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:08:15 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:08:15 +0000 |
| commit | 1b62b89312329852d43103c6ab718bd60cfacdcf (patch) | |
| tree | b4625f85380598c687161bd210632cda298d0c92 /ash/shell.h | |
| parent | 18e0f39b22f4c19185dcfea314177dff372c44be (diff) | |
| download | chromium_src-1b62b89312329852d43103c6ab718bd60cfacdcf.zip chromium_src-1b62b89312329852d43103c6ab718bd60cfacdcf.tar.gz chromium_src-1b62b89312329852d43103c6ab718bd60cfacdcf.tar.bz2 | |
Fixes crash in ShelfLayoutManager that would occur when closing window
with a full screen window. The problem was we deleted the launcher
and left other objects around so that if one of those other objects
needed the launcher we would crash.
BUG=110205
TEST=covered by unit tests.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9133017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 7bb5d0b..e9251ed 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -147,6 +147,10 @@ class ASH_EXPORT Shell { // Enables WorkspaceManager. void EnableWorkspaceManager(); + // Sets the LayoutManager of the container with the specified id to NULL. This + // has the effect of deleting the current LayoutManager. + void ResetLayoutManager(int container_id); + static Shell* instance_; std::vector<WindowAndBoundsPair> to_restore_; |