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

Side by Side Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 106713002: Move LaunchContainer enum to extension_constants.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/remoting/remote_desktop_browsertest.h" 5 #include "chrome/test/remoting/remote_desktop_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/unpacked_installer.h" 9 #include "chrome/browser/extensions/unpacked_installer.h"
10 #include "chrome/browser/ui/extensions/application_launch.h" 10 #include "chrome/browser/ui/extensions/application_launch.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 GURL chromoting_main = Chromoting_Main_URL(); 155 GURL chromoting_main = Chromoting_Main_URL();
156 // We cannot simply wait for any page load because the first page 156 // We cannot simply wait for any page load because the first page
157 // loaded could be the generated background page. We need to wait 157 // loaded could be the generated background page. We need to wait
158 // till the chromoting main page is loaded. 158 // till the chromoting main page is loaded.
159 PageLoadNotificationObserver observer(chromoting_main); 159 PageLoadNotificationObserver observer(chromoting_main);
160 160
161 OpenApplication(AppLaunchParams( 161 OpenApplication(AppLaunchParams(
162 browser()->profile(), 162 browser()->profile(),
163 extension_, 163 extension_,
164 is_platform_app() ? extensions::LAUNCH_NONE : extensions::LAUNCH_TAB, 164 is_platform_app() ? extensions::LAUNCH_CONTAINER_NONE :
165 extensions::LAUNCH_CONTAINER_TAB,
165 is_platform_app() ? NEW_WINDOW : CURRENT_TAB)); 166 is_platform_app() ? NEW_WINDOW : CURRENT_TAB));
166 167
167 observer.Wait(); 168 observer.Wait();
168 169
169 170
170 // The active WebContents instance should be the source of the LOAD_STOP 171 // The active WebContents instance should be the source of the LOAD_STOP
171 // notification. 172 // notification.
172 content::NavigationController* controller = 173 content::NavigationController* controller =
173 content::Source<content::NavigationController>(observer.source()).ptr(); 174 content::Source<content::NavigationController>(observer.source()).ptr();
174 175
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 } 688 }
688 689
689 // static 690 // static
690 bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow( 691 bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow(
691 content::WebContents* web_contents) { 692 content::WebContents* web_contents) {
692 return ExecuteScriptAndExtractBool( 693 return ExecuteScriptAndExtractBool(
693 web_contents, "remoting.identity.isAuthenticated()"); 694 web_contents, "remoting.identity.isAuthenticated()");
694 } 695 }
695 696
696 } // namespace remoting 697 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698