| 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 "base/ref_counted.h" | 5 #include "base/ref_counted.h" |
| 6 #include "chrome/browser/browser.h" | 6 #include "chrome/browser/browser.h" |
| 7 #include "chrome/browser/browser_list.h" | 7 #include "chrome/browser/browser_list.h" |
| 8 #include "chrome/browser/renderer_host/render_view_host.h" | 8 #include "chrome/browser/renderer_host/render_view_host.h" |
| 9 #include "chrome/browser/extensions/autoupdate_interceptor.h" | 9 #include "chrome/browser/extensions/autoupdate_interceptor.h" |
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
| 11 #include "chrome/browser/extensions/extension_error_reporter.h" |
| 11 #include "chrome/browser/extensions/extension_host.h" | 12 #include "chrome/browser/extensions/extension_host.h" |
| 12 #include "chrome/browser/extensions/extension_process_manager.h" | 13 #include "chrome/browser/extensions/extension_process_manager.h" |
| 13 #include "chrome/browser/extensions/extension_tabs_module.h" | 14 #include "chrome/browser/extensions/extension_tabs_module.h" |
| 14 #include "chrome/browser/extensions/extensions_service.h" | 15 #include "chrome/browser/extensions/extensions_service.h" |
| 15 #include "chrome/browser/extensions/extension_updater.h" | 16 #include "chrome/browser/extensions/extension_updater.h" |
| 16 #include "chrome/browser/profile.h" | 17 #include "chrome/browser/profile.h" |
| 17 #include "chrome/browser/renderer_host/site_instance.h" | 18 #include "chrome/browser/renderer_host/site_instance.h" |
| 18 #include "chrome/browser/tab_contents/tab_contents.h" | 19 #include "chrome/browser/tab_contents/tab_contents.h" |
| 19 #if defined(TOOLKIT_VIEWS) | 20 #if defined(TOOLKIT_VIEWS) |
| 20 #include "chrome/browser/views/extensions/extension_shelf.h" | 21 #include "chrome/browser/views/extensions/extension_shelf.h" |
| 21 #include "chrome/browser/views/frame/browser_view.h" | 22 #include "chrome/browser/views/frame/browser_view.h" |
| 22 #endif | 23 #endif |
| 23 | 24 |
| 24 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
| 25 #include "chrome/common/extensions/extension_error_reporter.h" | |
| 26 #include "chrome/common/notification_service.h" | 26 #include "chrome/common/notification_service.h" |
| 27 #include "chrome/common/url_constants.h" | 27 #include "chrome/common/url_constants.h" |
| 28 #include "chrome/test/ui_test_utils.h" | 28 #include "chrome/test/ui_test_utils.h" |
| 29 #include "net/base/net_util.h" | 29 #include "net/base/net_util.h" |
| 30 | 30 |
| 31 const std::string kSubscribePage = "/subscribe.html"; | 31 const std::string kSubscribePage = "/subscribe.html"; |
| 32 const std::wstring kFeedPage = L"files/feeds/feed.html"; | 32 const std::wstring kFeedPage = L"files/feeds/feed.html"; |
| 33 const std::wstring kFeedPageMultiRel = L"files/feeds/feed_multi_rel.html"; | 33 const std::wstring kFeedPageMultiRel = L"files/feeds/feed_multi_rel.html"; |
| 34 const std::wstring kNoFeedPage = L"files/feeds/no_feed.html"; | 34 const std::wstring kNoFeedPage = L"files/feeds/no_feed.html"; |
| 35 const std::wstring kValidFeed0 = L"files/feeds/feed_script.xml"; | 35 const std::wstring kValidFeed0 = L"files/feeds/feed_script.xml"; |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 | 764 |
| 765 // If the options page hasn't already come up, wait for it. | 765 // If the options page hasn't already come up, wait for it. |
| 766 if (tab_strip->count() == 1) { | 766 if (tab_strip->count() == 1) { |
| 767 ui_test_utils::WaitForNewTab(browser()); | 767 ui_test_utils::WaitForNewTab(browser()); |
| 768 } | 768 } |
| 769 ASSERT_EQ(2, tab_strip->count()); | 769 ASSERT_EQ(2, tab_strip->count()); |
| 770 | 770 |
| 771 EXPECT_EQ(extension->GetResourceURL("options.html"), | 771 EXPECT_EQ(extension->GetResourceURL("options.html"), |
| 772 tab_strip->GetTabContentsAt(1)->GetURL()); | 772 tab_strip->GetTabContentsAt(1)->GetURL()); |
| 773 } | 773 } |
| OLD | NEW |