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

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest_util.cc

Issue 10824204: Move small c/b/extensions classes into extensions namespace no.2 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq + nitfix Created 8 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/platform_app_browsertest_util.h" 5 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "chrome/browser/extensions/api/tabs/tabs.h" 9 #include "chrome/browser/extensions/api/tabs/tabs.h"
10 #include "chrome/browser/extensions/extension_function_test_utils.h" 10 #include "chrome/browser/extensions/extension_function_test_utils.h"
11 #include "chrome/browser/extensions/shell_window_registry.h" 11 #include "chrome/browser/extensions/shell_window_registry.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/extensions/application_launch.h" 13 #include "chrome/browser/ui/extensions/application_launch.h"
14 #include "chrome/browser/ui/extensions/shell_window.h" 14 #include "chrome/browser/ui/extensions/shell_window.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
17 #include "content/public/test/test_utils.h" 17 #include "content/public/test/test_utils.h"
18 18
19 using content::WebContents; 19 using content::WebContents;
20 using extensions::Extension;
21 20
22 namespace utils = extension_function_test_utils; 21 namespace utils = extension_function_test_utils;
23 22
24 void PlatformAppBrowserTest::SetUpCommandLine( 23 namespace extensions {
25 CommandLine* command_line) { 24
25 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
26 ExtensionBrowserTest::SetUpCommandLine(command_line); 26 ExtensionBrowserTest::SetUpCommandLine(command_line);
27 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 27 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
28 } 28 }
29 29
30 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp( 30 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp(
31 const char* name) { 31 const char* name) {
32 content::WindowedNotificationObserver app_loaded_observer( 32 content::WindowedNotificationObserver app_loaded_observer(
33 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, 33 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
34 content::NotificationService::AllSources()); 34 content::NotificationService::AllSources());
35 35
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 browser()->profile(), extension, GURL(""), params); 112 browser()->profile(), extension, GURL(""), params);
113 } 113 }
114 114
115 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { 115 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) {
116 content::WindowedNotificationObserver destroyed_observer( 116 content::WindowedNotificationObserver destroyed_observer(
117 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, 117 content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
118 content::NotificationService::AllSources()); 118 content::NotificationService::AllSources());
119 window->Close(); 119 window->Close();
120 destroyed_observer.Wait(); 120 destroyed_observer.Wait();
121 } 121 }
122
123 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest_util.h ('k') | chrome/browser/extensions/platform_app_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698