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

Side by Side Diff: apps/shell/test/shell_test.cc

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
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 "apps/shell/test/shell_test.h" 5 #include "apps/shell/test/shell_test.h"
6 6
7 #include "apps/shell/browser/shell_content_browser_client.h" 7 #include "apps/shell/browser/shell_content_browser_client.h"
8 #include "apps/shell/browser/shell_desktop_controller.h" 8 #include "apps/shell/browser/shell_desktop_controller.h"
9 #include "apps/shell/browser/shell_extension_system.h" 9 #include "apps/shell/browser/shell_extension_system.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 25 matching lines...) Expand all
36 void AppShellTest::RunTestOnMainThreadLoop() { 36 void AppShellTest::RunTestOnMainThreadLoop() {
37 base::MessageLoopForUI::current()->RunUntilIdle(); 37 base::MessageLoopForUI::current()->RunUntilIdle();
38 38
39 SetUpOnMainThread(); 39 SetUpOnMainThread();
40 40
41 RunTestOnMainThread(); 41 RunTestOnMainThread();
42 42
43 TearDownOnMainThread(); 43 TearDownOnMainThread();
44 44
45 // Clean up the app window. 45 // Clean up the app window.
46 ShellDesktopController::instance()->CloseAppWindow(); 46 ShellDesktopController::instance()->CloseAppWindows();
47 } 47 }
48 48
49 bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) { 49 bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) {
50 bool loaded = extension_system_->LoadApp(app_dir); 50 bool loaded = extension_system_->LoadApp(app_dir);
51 if (loaded) 51 if (loaded)
52 extension_system_->LaunchApp(); 52 extension_system_->LaunchApp();
53 return loaded; 53 return loaded;
54 } 54 }
55 55
56 } // namespace apps 56 } // namespace apps
OLDNEW
« no previous file with comments | « apps/shell/browser/shell_desktop_controller.cc ('k') | athena/activity/public/activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698