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

Side by Side Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 8937001: Fixes for the kWasRestarted pref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test build fix. Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/automation/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 handled = AutomationProvider::OnMessageReceived(message)) 472 handled = AutomationProvider::OnMessageReceived(message))
473 IPC_END_MESSAGE_MAP_EX() 473 IPC_END_MESSAGE_MAP_EX()
474 if (!deserialize_success) 474 if (!deserialize_success)
475 OnMessageDeserializationFailure(); 475 OnMessageDeserializationFailure();
476 return handled; 476 return handled;
477 } 477 }
478 478
479 void TestingAutomationProvider::OnChannelError() { 479 void TestingAutomationProvider::OnChannelError() {
480 if (!reinitialize_on_channel_error_ && 480 if (!reinitialize_on_channel_error_ &&
481 browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID) 481 browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID)
482 BrowserList::AttemptExit(false); 482 BrowserList::AttemptExit();
483 AutomationProvider::OnChannelError(); 483 AutomationProvider::OnChannelError();
484 } 484 }
485 485
486 void TestingAutomationProvider::CloseBrowser(int browser_handle, 486 void TestingAutomationProvider::CloseBrowser(int browser_handle,
487 IPC::Message* reply_message) { 487 IPC::Message* reply_message) {
488 if (!browser_tracker_->ContainsHandle(browser_handle)) 488 if (!browser_tracker_->ContainsHandle(browser_handle))
489 return; 489 return;
490 490
491 Browser* browser = browser_tracker_->GetResource(browser_handle); 491 Browser* browser = browser_tracker_->GetResource(browser_handle);
492 new BrowserClosedNotificationObserver(browser, this, reply_message); 492 new BrowserClosedNotificationObserver(browser, this, reply_message);
(...skipping 6167 matching lines...) Expand 10 before | Expand all | Expand 10 after
6660 6660
6661 Send(reply_message_); 6661 Send(reply_message_);
6662 redirect_query_ = 0; 6662 redirect_query_ = 0;
6663 reply_message_ = NULL; 6663 reply_message_ = NULL;
6664 } 6664 }
6665 6665
6666 void TestingAutomationProvider::OnRemoveProvider() { 6666 void TestingAutomationProvider::OnRemoveProvider() {
6667 if (g_browser_process) 6667 if (g_browser_process)
6668 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); 6668 g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
6669 } 6669 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/background/background_mode_manager.cc » ('j') | chrome/browser/ui/browser_init.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698