diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 20:21:38 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 20:21:38 +0000 |
commit | 94df8e60b43b5dd3489c0f023057c661cbd097a5 (patch) | |
tree | f576ac977a13f3096229267244fc10fa34e7ed99 /chrome/browser/ui/panels | |
parent | c2d6627b362f822cabdd811521a2ca959c0300f6 (diff) | |
download | chromium_src-94df8e60b43b5dd3489c0f023057c661cbd097a5.zip chromium_src-94df8e60b43b5dd3489c0f023057c661cbd097a5.tar.gz chromium_src-94df8e60b43b5dd3489c0f023057c661cbd097a5.tar.bz2 |
Revert 256244 "Added code to call CloseAsh in place of closing s..."
Reason for revert:
This CL appears to have broken
NewAvatarMenuButtonTest.SignOut
...on Win 7 Tests.
Log:
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%283%29/builds/25574/steps/browser_tests/logs/stdio
> Added code to call CloseAsh in place of closing secondary widgets on Windows.
> Here is what happens in attached bug:
> 1. UserManagerView (Profile view) adds a reference to browser process by calling StartKeepAlive.
> 2. UserManagerView is a secondary widget.
> 3. Current code for windows does EnumWindows for closing all secondary widgets in CloseAllSecondaryWidgets, which works only for desktop mode.
> 4. In Chrome on ASH EnumWindows doesn't do anything as they are not regular windows.
> 5. Because UserManagerView doesn't get chance to close through CloseAllSecondaryWidgets, it doesn't release reference and we browser process keeps running.
>
> CloseAsh closes all child widgets, which might be a overkill but works for now.
>
> BUG=340967
> R=cpu,sky,ananta
>
> Review URL: https://codereview.chromium.org/173403002
TBR=shrikant@chromium.org
Review URL: https://codereview.chromium.org/195553003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/panels')
-rw-r--r-- | chrome/browser/ui/panels/panel.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index 27e08a32..7fe7aa5 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -154,10 +154,8 @@ bool PanelExtensionWindowController::IsVisibleToExtension( Panel::~Panel() { DCHECK(!collection_); -#if !defined(USE_AURA) // Invoked by native panel destructor. Do not access native_panel_ here. chrome::DecrementKeepAliveCount(); // Remove shutdown prevention. -#endif } PanelManager* Panel::manager() const { @@ -539,11 +537,8 @@ void Panel::Initialize(const GURL& url, content::Source<ThemeService>( ThemeServiceFactory::GetForProfile(profile_))); -#if !defined(USE_AURA) - // Keep alive for AURA has been moved to panel_view. // Prevent the browser process from shutting down while this window is open. chrome::IncrementKeepAliveCount(); -#endif UpdateAppIcon(); } |