From 263ff4f2eda2f117aa9055c324387721a33650cc Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Fri, 4 Jan 2013 20:23:01 +0000 Subject: Cause Chrome Frame to follow the fast shutdown path, which cleans up infobars and avoids a crash on shutdown. Chrome Frame Android were the only remaining things in Chrome that appear not to use the fast shutdown path and afaict the non-fast shutdown path no longer works. BUG=148398 TEST=Visit hyves.nl or some other CF-aware site that pops up a translation bar in CF. Close IE, using an attached debugger or your mechanism of choice observe that Chrome doesn't crash during shutdown. TBR=sky Review URL: https://chromiumcodereview.appspot.com/11746029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175182 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_content_browser_client.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chrome/browser/chrome_content_browser_client.cc') diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 20a4a83..c31883c 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1504,8 +1504,7 @@ AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { } bool ChromeContentBrowserClient::IsFastShutdownPossible() { - const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); - return !browser_command_line.HasSwitch(switches::kChromeFrame); + return true; } void ChromeContentBrowserClient::OverrideWebkitPrefs( -- cgit v1.1