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

Unified Diff: apps/shell/app/shell_main_delegate.cc

Issue 205653002: Add apps_browsertests target (currently running 0 tests). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: apps/shell/app/shell_main_delegate.cc
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 13706cda47a78edcf9960e4953b1c0c3a6a0e880..d9f9904559637dd3aa5a0f3fd19bafb079bb909c 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -64,6 +64,26 @@ void ShellMainDelegate::PreSandboxStartup() {
InitializeResourceBundle();
}
+int ShellMainDelegate::RunProcess(
jam 2014/03/20 16:58:13 I'm assuming you copied this from content/shell? T
Yoyo Zhou 2014/03/20 21:17:30 Ok. I deleted it for now. As I was trying to get t
+ const std::string& process_type,
+ const content::MainFunctionParams& main_function_params) {
+ if (!process_type.empty())
James Cook 2014/03/20 00:00:35 nit: Maybe comment that empty process_type means b
+ return -1;
+
+ scoped_ptr<content::BrowserMainRunner> browser_main_runner;
+ browser_main_runner.reset(content::BrowserMainRunner::Create());
James Cook 2014/03/20 00:00:35 nit: Maybe collapse with line above? scoped_ptr<c
+ int exit_code = browser_main_runner->Initialize(main_function_params);
+ DCHECK_LT(exit_code, 0)
+ << "BrowserMainRunner::Initialize failed in apps::ShellMainDelegate";
+ if (exit_code >= 0)
+ return exit_code;
+
+ browser_main_runner->Run();
+ // TODO(yoz): close windows?
James Cook 2014/03/20 00:00:35 Not for this CL, but I suspect we'll need to expli
+ browser_main_runner->Shutdown();
+ return 0;
+}
+
content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
browser_client_.reset(new apps::ShellContentBrowserClient);
return browser_client_.get();

Powered by Google App Engine
This is Rietveld 408576698