Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 3364019: Allow overriding of X error functions (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/browser_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index a2264e94f0b2877dcee791686e60a25300c43307..998f3220d87245a8558565f4e36691a7a72f2bbf 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/bookmarks/bookmark_storage.h"
#include "chrome/browser/blocked_popup_container.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/debugger/devtools_manager.h"
#include "chrome/browser/download/download_prefs.h"
@@ -419,7 +420,8 @@ void TestingAutomationProvider::OnMessageReceived(
}
void TestingAutomationProvider::OnChannelError() {
- BrowserList::CloseAllBrowsersAndExit();
+ if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID)
darin (slow to review) 2010/09/13 18:37:07 LGTM This might be clearer if we had a helper fun
+ BrowserList::CloseAllBrowsersAndExit();
AutomationProvider::OnChannelError();
}
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/browser_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698