diff options
| author | cduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 21:31:44 +0000 |
|---|---|---|
| committer | cduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 21:31:44 +0000 |
| commit | bf25115a51df82c909a4d3499014697e7ab6d30f (patch) | |
| tree | 002c4a19f4186e3406a09bc4fef9cc16fd7c84d5 /chrome/browser/extensions | |
| parent | cf0de89088da61db5f7f3d182f69635ac7e8e1d3 (diff) | |
| download | chromium_src-bf25115a51df82c909a4d3499014697e7ab6d30f.zip chromium_src-bf25115a51df82c909a4d3499014697e7ab6d30f.tar.gz chromium_src-bf25115a51df82c909a4d3499014697e7ab6d30f.tar.bz2 | |
Default browser action icon to the puzzle piece.
If an extension has a browser action but does not specify an
icon, it is now set the puzzle piece icon.
*I do not have a Mac for testing, so the cocoa changes will need to be verified*
BUG=116626
TEST=BrowserActionApiTest.DynamicBrowserAction,
Make an extension with a browser action but no icon. The
icon should default to the puzzle piece.
Review URL: http://codereview.chromium.org/9665038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 84dfb04..e42af47 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -98,7 +98,11 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) { // Test that there is a browser action in the toolbar. ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions()); - EXPECT_FALSE(GetBrowserActionsBar().HasIcon(0)); + EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0)); + + // Set prev_id which holds the id of the previous image, and use it in the + // next test to see if the image changes. + uint32_t prev_id = extension->browser_action()->GetIcon(0).getGenerationID(); // Tell the extension to update the icon using setIcon({imageData:...}). ResultCatcher catcher; @@ -108,18 +112,15 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) { // Test that we received the changes. EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0)); - - // Set prev_id which holds the id of the previous image, and use it in the - // next test to see if the image changes. - uint32_t prev_id = extension->browser_action()->GetIcon(0).getGenerationID(); + EXPECT_NE(prev_id, extension->browser_action()->GetIcon(0).getGenerationID()); + prev_id = extension->browser_action()->GetIcon(0).getGenerationID(); // Tell the extension to update the icon using setIcon({path:...}). ui_test_utils::NavigateToURL(browser(), GURL(extension->GetResourceURL("update2.html"))); ASSERT_TRUE(catcher.GetNextResult()); EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0)); - EXPECT_TRUE(prev_id != - extension->browser_action()->GetIcon(0).getGenerationID()); + EXPECT_NE(prev_id, extension->browser_action()->GetIcon(0).getGenerationID()); } // This test is flaky as per http://crbug.com/74557. |