diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 23:32:39 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 23:32:39 +0000 |
| commit | 27798ec69952c2987ca5b1891ac3e5aee544821f (patch) | |
| tree | da8048d77135659b291857ce97e2e72f6ccf9080 | |
| parent | 721848c3ec55ac7e305cafd3edba618b7ff106d5 (diff) | |
| download | chromium_src-27798ec69952c2987ca5b1891ac3e5aee544821f.zip chromium_src-27798ec69952c2987ca5b1891ac3e5aee544821f.tar.gz chromium_src-27798ec69952c2987ca5b1891ac3e5aee544821f.tar.bz2 | |
Ensure that the legacy Windows 8 New Window/New Incognito Window handling does not interfere with these operations on Windows 8 ASH.
On trunk the New Window/New Incognito Window operations on Windows 8 ASH crash. This is because of non AURA handling of these operations.
That code should not be executing for AURA.
BUG=151718
R=sky
Review URL: https://codereview.chromium.org/11411040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168328 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/browser_win.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc index 4b81b70..f123e24 100644 --- a/chrome/browser/ui/browser_win.cc +++ b/chrome/browser/ui/browser_win.cc @@ -47,19 +47,23 @@ void NewMetroWindow(Browser* source_browser, Profile* profile) { namespace chrome { void NewWindow(Browser* browser) { +#if !defined(USE_AURA) if (base::win::IsMetroProcess()) { NewMetroWindow(browser, browser->profile()->GetOriginalProfile()); return; } +#endif NewEmptyWindow(browser->profile()->GetOriginalProfile(), browser->host_desktop_type()); } void NewIncognitoWindow(Browser* browser) { +#if !defined(USE_AURA) if (base::win::IsMetroProcess()) { NewMetroWindow(browser, browser->profile()->GetOffTheRecordProfile()); return; } +#endif NewEmptyWindow(browser->profile()->GetOffTheRecordProfile(), browser->host_desktop_type()); } |