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

Unified Diff: chrome/browser/remoting/setup_flow.cc

Issue 6461024: Revert 74292 - Splits ChromeURLDataManager into 2 chunks:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/profiles/profile_impl.cc ('k') | chrome/browser/sync/profile_sync_service_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/remoting/setup_flow.cc
===================================================================
--- chrome/browser/remoting/setup_flow.cc (revision 74293)
+++ chrome/browser/remoting/setup_flow.cc (working copy)
@@ -115,16 +115,18 @@
SetupFlowContext::SetupFlowContext() { }
SetupFlowContext::~SetupFlowContext() { }
-SetupFlow::SetupFlow(const std::string& args,
- Profile* profile,
+SetupFlow::SetupFlow(const std::string& args, Profile* profile,
SetupFlowStep* first_step)
: dom_ui_(NULL),
dialog_start_args_(args),
profile_(profile),
current_step_(first_step) {
// TODO(hclam): The data source should be added once.
- profile->GetChromeURLDataManager()->AddDataSource(
- new RemotingResourcesSource());
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+ &ChromeURLDataManager::AddDataSource,
+ make_scoped_refptr(new RemotingResourcesSource())));
}
SetupFlow::~SetupFlow() { }
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/sync/profile_sync_service_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698