| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 GURL url(test_server()->GetURL("empty.html")); | 107 GURL url(test_server()->GetURL("empty.html")); |
| 108 TabStripModel* model = browser()->tabstrip_model(); | 108 TabStripModel* model = browser()->tabstrip_model(); |
| 109 | 109 |
| 110 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 110 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 111 | 111 |
| 112 Extension* extension_app = GetExtension(); | 112 Extension* extension_app = GetExtension(); |
| 113 | 113 |
| 114 ui_test_utils::NavigateToURL(browser(), url); | 114 ui_test_utils::NavigateToURL(browser(), url); |
| 115 | 115 |
| 116 TabContents* app_contents = new TabContents(browser()->profile(), NULL, | 116 TabContents* app_contents = new TabContents(browser()->profile(), NULL, |
| 117 MSG_ROUTING_NONE, NULL); | 117 MSG_ROUTING_NONE, NULL, NULL); |
| 118 app_contents->SetExtensionApp(extension_app); | 118 app_contents->SetExtensionApp(extension_app); |
| 119 | 119 |
| 120 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); | 120 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); |
| 121 model->SetTabPinned(0, true); | 121 model->SetTabPinned(0, true); |
| 122 ui_test_utils::NavigateToURL(browser(), url); | 122 ui_test_utils::NavigateToURL(browser(), url); |
| 123 | 123 |
| 124 // Close the first, which should make it a phantom. | 124 // Close the first, which should make it a phantom. |
| 125 model->CloseTabContentsAt(0, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB); | 125 model->CloseTabContentsAt(0, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB); |
| 126 | 126 |
| 127 // There should still be two tabs. | 127 // There should still be two tabs. |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 GURL url(test_server()->GetURL("empty.html")); | 452 GURL url(test_server()->GetURL("empty.html")); |
| 453 TabStripModel* model = browser()->tabstrip_model(); | 453 TabStripModel* model = browser()->tabstrip_model(); |
| 454 | 454 |
| 455 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 455 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 456 | 456 |
| 457 Extension* extension_app = GetExtension(); | 457 Extension* extension_app = GetExtension(); |
| 458 | 458 |
| 459 ui_test_utils::NavigateToURL(browser(), url); | 459 ui_test_utils::NavigateToURL(browser(), url); |
| 460 | 460 |
| 461 TabContents* app_contents = new TabContents(browser()->profile(), NULL, | 461 TabContents* app_contents = new TabContents(browser()->profile(), NULL, |
| 462 MSG_ROUTING_NONE, NULL); | 462 MSG_ROUTING_NONE, NULL, NULL); |
| 463 app_contents->SetExtensionApp(extension_app); | 463 app_contents->SetExtensionApp(extension_app); |
| 464 | 464 |
| 465 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); | 465 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); |
| 466 model->SetTabPinned(0, true); | 466 model->SetTabPinned(0, true); |
| 467 ui_test_utils::NavigateToURL(browser(), url); | 467 ui_test_utils::NavigateToURL(browser(), url); |
| 468 | 468 |
| 469 MockTabStripModelObserver observer; | 469 MockTabStripModelObserver observer; |
| 470 model->AddObserver(&observer); | 470 model->AddObserver(&observer); |
| 471 | 471 |
| 472 // Uninstall the extension and make sure TabClosing is sent. | 472 // Uninstall the extension and make sure TabClosing is sent. |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 ASSERT_TRUE(test_server()->Start()); | 547 ASSERT_TRUE(test_server()->Start()); |
| 548 | 548 |
| 549 // Add an pinned app tab. | 549 // Add an pinned app tab. |
| 550 host_resolver()->AddRule("www.example.com", "127.0.0.1"); | 550 host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
| 551 GURL url(test_server()->GetURL("empty.html")); | 551 GURL url(test_server()->GetURL("empty.html")); |
| 552 TabStripModel* model = browser()->tabstrip_model(); | 552 TabStripModel* model = browser()->tabstrip_model(); |
| 553 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 553 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 554 Extension* extension_app = GetExtension(); | 554 Extension* extension_app = GetExtension(); |
| 555 ui_test_utils::NavigateToURL(browser(), url); | 555 ui_test_utils::NavigateToURL(browser(), url); |
| 556 TabContents* app_contents = new TabContents(browser()->profile(), NULL, | 556 TabContents* app_contents = new TabContents(browser()->profile(), NULL, |
| 557 MSG_ROUTING_NONE, NULL); | 557 MSG_ROUTING_NONE, NULL, NULL); |
| 558 app_contents->SetExtensionApp(extension_app); | 558 app_contents->SetExtensionApp(extension_app); |
| 559 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); | 559 model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); |
| 560 model->SetTabPinned(0, true); | 560 model->SetTabPinned(0, true); |
| 561 ui_test_utils::NavigateToURL(browser(), url); | 561 ui_test_utils::NavigateToURL(browser(), url); |
| 562 | 562 |
| 563 // Add a non pinned tab. | 563 // Add a non pinned tab. |
| 564 browser()->NewTab(); | 564 browser()->NewTab(); |
| 565 | 565 |
| 566 // Add a pinned non-app tab. | 566 // Add a pinned non-app tab. |
| 567 browser()->NewTab(); | 567 browser()->NewTab(); |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 | 851 |
| 852 // The normal browser should now have four. | 852 // The normal browser should now have four. |
| 853 EXPECT_EQ(4, browser()->tab_count()); | 853 EXPECT_EQ(4, browser()->tab_count()); |
| 854 | 854 |
| 855 // Close the additional browsers. | 855 // Close the additional browsers. |
| 856 popup_browser->CloseAllTabs(); | 856 popup_browser->CloseAllTabs(); |
| 857 app_browser->CloseAllTabs(); | 857 app_browser->CloseAllTabs(); |
| 858 app_popup_browser->CloseAllTabs(); | 858 app_popup_browser->CloseAllTabs(); |
| 859 } | 859 } |
| 860 #endif | 860 #endif |
| OLD | NEW |