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

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

Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged ToT 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #if defined(OS_MACOSX) 10 #if defined(OS_MACOSX)
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 GURL url(test_server()->GetURL("empty.html")); 792 GURL url(test_server()->GetURL("empty.html"));
793 TabStripModel* model = browser()->tab_strip_model(); 793 TabStripModel* model = browser()->tab_strip_model();
794 794
795 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); 795 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
796 796
797 const Extension* extension_app = GetExtension(); 797 const Extension* extension_app = GetExtension();
798 798
799 ui_test_utils::NavigateToURL(browser(), url); 799 ui_test_utils::NavigateToURL(browser(), url);
800 800
801 TabContents* app_contents = chrome::TabContentsFactory( 801 TabContents* app_contents = chrome::TabContentsFactory(
802 browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); 802 browser()->profile(), NULL, MSG_ROUTING_NONE, NULL);
803 app_contents->extension_tab_helper()->SetExtensionApp(extension_app); 803 app_contents->extension_tab_helper()->SetExtensionApp(extension_app);
804 804
805 model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0), 805 model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0),
806 TabStripModel::ADD_NONE); 806 TabStripModel::ADD_NONE);
807 model->SetTabPinned(0, true); 807 model->SetTabPinned(0, true);
808 ui_test_utils::NavigateToURL(browser(), url); 808 ui_test_utils::NavigateToURL(browser(), url);
809 809
810 MockTabStripModelObserver observer; 810 MockTabStripModelObserver observer;
811 model->AddObserver(&observer); 811 model->AddObserver(&observer);
812 812
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 ASSERT_TRUE(test_server()->Start()); 911 ASSERT_TRUE(test_server()->Start());
912 912
913 // Add an pinned app tab. 913 // Add an pinned app tab.
914 host_resolver()->AddRule("www.example.com", "127.0.0.1"); 914 host_resolver()->AddRule("www.example.com", "127.0.0.1");
915 GURL url(test_server()->GetURL("empty.html")); 915 GURL url(test_server()->GetURL("empty.html"));
916 TabStripModel* model = browser()->tab_strip_model(); 916 TabStripModel* model = browser()->tab_strip_model();
917 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); 917 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
918 const Extension* extension_app = GetExtension(); 918 const Extension* extension_app = GetExtension();
919 ui_test_utils::NavigateToURL(browser(), url); 919 ui_test_utils::NavigateToURL(browser(), url);
920 TabContents* app_contents = chrome::TabContentsFactory( 920 TabContents* app_contents = chrome::TabContentsFactory(
921 browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); 921 browser()->profile(), NULL, MSG_ROUTING_NONE, NULL);
922 app_contents->extension_tab_helper()->SetExtensionApp(extension_app); 922 app_contents->extension_tab_helper()->SetExtensionApp(extension_app);
923 model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0), 923 model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0),
924 TabStripModel::ADD_NONE); 924 TabStripModel::ADD_NONE);
925 model->SetTabPinned(0, true); 925 model->SetTabPinned(0, true);
926 ui_test_utils::NavigateToURL(browser(), url); 926 ui_test_utils::NavigateToURL(browser(), url);
927 927
928 // Add a non pinned tab. 928 // Add a non pinned tab.
929 chrome::NewTab(browser()); 929 chrome::NewTab(browser());
930 930
931 // Add a pinned non-app tab. 931 // Add a pinned non-app tab.
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 command_line->AppendSwitchASCII(switches::kApp, url.spec()); 1584 command_line->AppendSwitchASCII(switches::kApp, url.spec());
1585 } 1585 }
1586 }; 1586 };
1587 1587
1588 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { 1588 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) {
1589 // Test that an application browser window loads correctly. 1589 // Test that an application browser window loads correctly.
1590 1590
1591 // Verify the browser is in application mode. 1591 // Verify the browser is in application mode.
1592 EXPECT_TRUE(browser()->IsApplication()); 1592 EXPECT_TRUE(browser()->IsApplication());
1593 } 1593 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/background_contents.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698