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

Unified Diff: apps/shell/browser/shell_browser_main_parts.cc

Issue 205653002: Add apps_browsertests target (currently running 0 tests). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win gyp fix 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
« no previous file with comments | « apps/shell/browser/shell_browser_main_parts.h ('k') | apps/test/app_shell_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_browser_main_parts.cc
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index ab9aac2d8f7bdb0a6f8a7539e077854b949c486c..fefaf0c5f53cab907dbb738c5d0a53335b7a70b5 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -76,8 +76,7 @@ namespace apps {
ShellBrowserMainParts::ShellBrowserMainParts(
const content::MainFunctionParams& parameters)
- : extension_system_(NULL) {
-}
+ : extension_system_(NULL), parameters_(parameters) {}
ShellBrowserMainParts::~ShellBrowserMainParts() {
}
@@ -131,6 +130,15 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
devtools_delegate_.reset(
new content::ShellDevToolsDelegate(browser_context_.get()));
+ // For running browser tests.
+ // TODO(yoz): This is set up to exit prematurely because we don't have
+ // any tests yet.
+ if (parameters_.ui_task) {
+ parameters_.ui_task->Run();
+ delete parameters_.ui_task;
+ return;
+ }
+
CreateRootWindow();
CreateViewsDelegate();
« no previous file with comments | « apps/shell/browser/shell_browser_main_parts.h ('k') | apps/test/app_shell_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698