diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 17:54:43 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 17:54:43 +0000 |
| commit | 4ef14de573bc757bb7d4043963c9d64f4c74439b (patch) | |
| tree | d9120c98923122ba0e166d0f8f79827139ef3fe6 /ash/root_window_controller.h | |
| parent | a27ef629458d52f24a7c5ee50eb9bb01fbfcecfd (diff) | |
| download | chromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.zip chromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.tar.gz chromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.tar.bz2 | |
Cancel drag if display configuration changes.
* Removed debug specific shortcut to emulate display change.
* fixed ui_controls to use the correct position
* a few minor clean ups (removing unnecessary namesapce,
rename Monitor -> Display)
BUG=14457
TEST=covered by test
Review URL: https://chromiumcodereview.appspot.com/10909043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 473c96e..c17d85a 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -59,6 +59,12 @@ class RootWindowController { void CreateContainers(); void InitLayoutManagers(); + // Deletes associated objects and clears the state, but doesn't delete + // the root window yet. This is used to delete a secondary displays' + // root window safely when the display disconnect signal is received, + // which may come while we're in the nested message loop. + void Shutdown(); + // Deletes all child windows and performs necessary cleanup. void CloseChildWindows(); |