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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_list.h" 8 #include "chrome/browser/ui/browser_list.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 "files/extensions/api_test/window_open/popup_blocking/hosted_app/"); 135 "files/extensions/api_test/window_open/popup_blocking/hosted_app/");
136 136
137 GURL open_tab = 137 GURL open_tab =
138 test_server()->GetURL(popup_app_contents_path + "open_tab.html") 138 test_server()->GetURL(popup_app_contents_path + "open_tab.html")
139 .ReplaceComponents(replace_host); 139 .ReplaceComponents(replace_host);
140 GURL open_popup = 140 GURL open_popup =
141 test_server()->GetURL(popup_app_contents_path + "open_popup.html") 141 test_server()->GetURL(popup_app_contents_path + "open_popup.html")
142 .ReplaceComponents(replace_host); 142 .ReplaceComponents(replace_host);
143 143
144 browser()->OpenURL(open_tab, GURL(), NEW_FOREGROUND_TAB, 144 browser()->OpenURL(open_tab, GURL(), NEW_FOREGROUND_TAB,
145 PageTransition::TYPED); 145 content::PAGE_TRANSITION_TYPED);
146 browser()->OpenURL(open_popup, GURL(), NEW_FOREGROUND_TAB, 146 browser()->OpenURL(open_popup, GURL(), NEW_FOREGROUND_TAB,
147 PageTransition::TYPED); 147 content::PAGE_TRANSITION_TYPED);
148 148
149 WaitForTabsAndPopups(browser(), 3, 1); 149 WaitForTabsAndPopups(browser(), 3, 1);
150 } 150 }
151 151
152 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) { 152 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) {
153 ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_; 153 ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_;
154 } 154 }
155 155
156 class WindowOpenPanelTest : public ExtensionApiTest { 156 class WindowOpenPanelTest : public ExtensionApiTest {
157 virtual void SetUpCommandLine(CommandLine* command_line) { 157 virtual void SetUpCommandLine(CommandLine* command_line) {
(...skipping 10 matching lines...) Expand all
168 #if defined(OS_MACOSX) || defined(OS_WIN) 168 #if defined(OS_MACOSX) || defined(OS_WIN)
169 // Focus test fails if there is no window manager on Linux. 169 // Focus test fails if there is no window manager on Linux.
170 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, WindowOpenFocus) { 170 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, WindowOpenFocus) {
171 ASSERT_TRUE(RunExtensionTest("window_open/focus")) << message_; 171 ASSERT_TRUE(RunExtensionTest("window_open/focus")) << message_;
172 } 172 }
173 #endif 173 #endif
174 174
175 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpener) { 175 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpener) {
176 ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_; 176 ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_;
177 } 177 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/webstore_inline_installer.cc ('k') | chrome/browser/external_tab_container_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698