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

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

Issue 339041: Rename getTabContentses to getExtensionTabs. (Closed)
Patch Set: Update docs Created 11 years, 1 month 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
« no previous file with comments | « no previous file | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ui_test_utils::ExecuteJavaScriptAndExtractBool( 123 ui_test_utils::ExecuteJavaScriptAndExtractBool(
124 host->render_view_host(), L"", L"testgetBackgroundPageAPI()", &result); 124 host->render_view_host(), L"", L"testgetBackgroundPageAPI()", &result);
125 EXPECT_TRUE(result); 125 EXPECT_TRUE(result);
126 126
127 ui_test_utils::NavigateToURL( 127 ui_test_utils::NavigateToURL(
128 browser(), 128 browser(),
129 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/" 129 GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/"
130 "test_gettabs.html")); 130 "test_gettabs.html"));
131 result = false; 131 result = false;
132 ui_test_utils::ExecuteJavaScriptAndExtractBool( 132 ui_test_utils::ExecuteJavaScriptAndExtractBool(
133 host->render_view_host(), L"", L"testgetTabContentsesAPI()", &result); 133 host->render_view_host(), L"", L"testgetExtensionTabsAPI()", &result);
134 EXPECT_TRUE(result); 134 EXPECT_TRUE(result);
135 } 135 }
136 #endif // defined(OS_WIN) 136 #endif // defined(OS_WIN)
137 137
138 #if defined(OS_WIN) // TODO(port) -- enable 138 #if defined(OS_WIN) // TODO(port) -- enable
139 // Tests that the ExtensionShelf initializes properly, notices that 139 // Tests that the ExtensionShelf initializes properly, notices that
140 // an extension loaded and has a view available, and then sets that up 140 // an extension loaded and has a view available, and then sets that up
141 // properly. 141 // properly.
142 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Shelf) { 142 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Shelf) {
143 // When initialized, there are no extension views and the preferred height 143 // When initialized, there are no extension views and the preferred height
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 // If the options page hasn't already come up, wait for it. 823 // If the options page hasn't already come up, wait for it.
824 if (tab_strip->count() == 1) { 824 if (tab_strip->count() == 1) {
825 ui_test_utils::WaitForNewTab(browser()); 825 ui_test_utils::WaitForNewTab(browser());
826 } 826 }
827 ASSERT_EQ(2, tab_strip->count()); 827 ASSERT_EQ(2, tab_strip->count());
828 828
829 EXPECT_EQ(extension->GetResourceURL("options.html"), 829 EXPECT_EQ(extension->GetResourceURL("options.html"),
830 tab_strip->GetTabContentsAt(1)->GetURL()); 830 tab_strip->GetTabContentsAt(1)->GetURL());
831 } 831 }
832 832
OLDNEW
« no previous file with comments | « no previous file | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698