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

Side by Side Diff: chrome/browser/ui/browser_navigator_browsertest.cc

Issue 10692195: Consolidate Browser Creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
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/ui/browser_navigator_browsertest.h" 5 #include "chrome/browser/ui/browser_navigator_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/prefs/incognito_mode_prefs.h" 9 #include "chrome/browser/prefs/incognito_mode_prefs.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 chrome::NavigateParams BrowserNavigatorTest::MakeNavigateParams( 61 chrome::NavigateParams BrowserNavigatorTest::MakeNavigateParams(
62 Browser* browser) const { 62 Browser* browser) const {
63 chrome::NavigateParams params(browser, GetGoogleURL(), 63 chrome::NavigateParams params(browser, GetGoogleURL(),
64 content::PAGE_TRANSITION_LINK); 64 content::PAGE_TRANSITION_LINK);
65 params.window_action = chrome::NavigateParams::SHOW_WINDOW; 65 params.window_action = chrome::NavigateParams::SHOW_WINDOW;
66 return params; 66 return params;
67 } 67 }
68 68
69 Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type, 69 Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type,
70 Profile* profile) { 70 Profile* profile) {
71 Browser* browser = Browser::CreateWithParams( 71 Browser* browser = new Browser(Browser::CreateParams(type, profile));
72 Browser::CreateParams(type, profile));
73 chrome::AddBlankTab(browser, true); 72 chrome::AddBlankTab(browser, true);
74 return browser; 73 return browser;
75 } 74 }
76 75
77 Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type, 76 Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type,
78 Profile* profile) { 77 Profile* profile) {
79 Browser* browser = Browser::CreateWithParams( 78 Browser* browser = new Browser(
80 Browser::CreateParams::CreateForApp( 79 Browser::CreateParams::CreateForApp(
81 Browser::TYPE_POPUP, "Test", gfx::Rect(), profile)); 80 Browser::TYPE_POPUP, "Test", gfx::Rect(), profile));
82 chrome::AddBlankTab(browser, true); 81 chrome::AddBlankTab(browser, true);
83 return browser; 82 return browser;
84 } 83 }
85 84
86 TabContents* BrowserNavigatorTest::CreateTabContents() { 85 TabContents* BrowserNavigatorTest::CreateTabContents() {
87 return chrome::TabContentsFactory( 86 return chrome::TabContentsFactory(
88 browser()->profile(), 87 browser()->profile(),
89 NULL, 88 NULL,
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1235 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
1237 command_line->AppendSwitch(switches::kEnablePanels); 1236 command_line->AppendSwitch(switches::kEnablePanels);
1238 } 1237 }
1239 }; 1238 };
1240 1239
1241 IN_PROC_BROWSER_TEST_F(PanelBrowserNavigatorTest, NavigateFromCrashedPanel) { 1240 IN_PROC_BROWSER_TEST_F(PanelBrowserNavigatorTest, NavigateFromCrashedPanel) {
1242 GURL url("http://maps.google.com/#a"); 1241 GURL url("http://maps.google.com/#a");
1243 GURL url2("http://maps.google.com/#b"); 1242 GURL url2("http://maps.google.com/#b");
1244 1243
1245 // Create a panel. 1244 // Create a panel.
1246 Browser* panel_browser = Browser::CreateWithParams( 1245 Browser* panel_browser = new Browser(
1247 Browser::CreateParams::CreateForApp( 1246 Browser::CreateParams::CreateForApp(
1248 Browser::TYPE_PANEL, "Test", gfx::Rect(100, 100), 1247 Browser::TYPE_PANEL, "Test", gfx::Rect(100, 100),
1249 browser()->profile())); 1248 browser()->profile()));
1250 1249
1251 // Navigate to the page. 1250 // Navigate to the page.
1252 chrome::NavigateParams p(MakeNavigateParams(panel_browser)); 1251 chrome::NavigateParams p(MakeNavigateParams(panel_browser));
1253 p.url = url; 1252 p.url = url;
1254 p.disposition = CURRENT_TAB; 1253 p.disposition = CURRENT_TAB;
1255 chrome::Navigate(&p); 1254 chrome::Navigate(&p);
1256 1255
(...skipping 22 matching lines...) Expand all
1279 EXPECT_EQ(browser(), p2.browser); 1278 EXPECT_EQ(browser(), p2.browser);
1280 1279
1281 // We should now have two windows, the browser() provided by the framework and 1280 // We should now have two windows, the browser() provided by the framework and
1282 // the panel window we opened earlier. The tabbed browser window has 2 tabs. 1281 // the panel window we opened earlier. The tabbed browser window has 2 tabs.
1283 EXPECT_EQ(2u, BrowserList::size()); 1282 EXPECT_EQ(2u, BrowserList::size());
1284 EXPECT_EQ(2, browser()->tab_count()); 1283 EXPECT_EQ(2, browser()->tab_count());
1285 EXPECT_EQ(1, panel_browser->tab_count()); 1284 EXPECT_EQ(1, panel_browser->tab_count());
1286 } 1285 }
1287 1286
1288 } // namespace 1287 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/browser_tab_restore_service_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698