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

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.cc

Issue 2133083002: Remove all remaining traces of MessageLoopProxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_browser_main_parts.h" 5 #include "extensions/shell/browser/shell_browser_main_parts.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 cmd->GetSwitchValueASCII(switches::kAppShellUser), 199 cmd->GetSwitchValueASCII(switches::kAppShellUser),
200 cmd->GetSwitchValueASCII(switches::kAppShellRefreshToken))); 200 cmd->GetSwitchValueASCII(switches::kAppShellRefreshToken)));
201 201
202 #if !defined(DISABLE_NACL) 202 #if !defined(DISABLE_NACL)
203 // Takes ownership. 203 // Takes ownership.
204 nacl::NaClBrowser::SetDelegate( 204 nacl::NaClBrowser::SetDelegate(
205 new ShellNaClBrowserDelegate(browser_context_.get())); 205 new ShellNaClBrowserDelegate(browser_context_.get()));
206 // Track the task so it can be canceled if app_shell shuts down very quickly, 206 // Track the task so it can be canceled if app_shell shuts down very quickly,
207 // such as in browser tests. 207 // such as in browser tests.
208 task_tracker_.PostTask( 208 task_tracker_.PostTask(
209 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), 209 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO).get(), FROM_HERE,
210 FROM_HERE,
211 base::Bind(nacl::NaClProcessHost::EarlyStartup)); 210 base::Bind(nacl::NaClProcessHost::EarlyStartup));
212 #endif 211 #endif
213 212
214 devtools_http_handler_.reset( 213 devtools_http_handler_.reset(
215 content::ShellDevToolsManagerDelegate::CreateHttpHandler( 214 content::ShellDevToolsManagerDelegate::CreateHttpHandler(
216 browser_context_.get())); 215 browser_context_.get()));
217 if (parameters_.ui_task) { 216 if (parameters_.ui_task) {
218 // For running browser tests. 217 // For running browser tests.
219 parameters_.ui_task->Run(); 218 parameters_.ui_task->Run();
220 delete parameters_.ui_task; 219 delete parameters_.ui_task;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 } 289 }
291 290
292 void ShellBrowserMainParts::CreateExtensionSystem() { 291 void ShellBrowserMainParts::CreateExtensionSystem() {
293 DCHECK(browser_context_); 292 DCHECK(browser_context_);
294 extension_system_ = static_cast<ShellExtensionSystem*>( 293 extension_system_ = static_cast<ShellExtensionSystem*>(
295 ExtensionSystem::Get(browser_context_.get())); 294 ExtensionSystem::Get(browser_context_.get()));
296 extension_system_->InitForRegularProfile(true); 295 extension_system_->InitForRegularProfile(true);
297 } 296 }
298 297
299 } // namespace extensions 298 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_browser_context.cc ('k') | extensions/shell/browser/shell_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698