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

Unified Diff: chrome/browser/ui/views/browser_actions_container_browsertest.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review feedback Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/browser_actions_container_browsertest.cc
diff --git a/chrome/browser/ui/views/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
index 8888178b8ecb7394cf9cbe234a9d3baab6cbfc41..ebdf5f12024a523a76550d37ed63e6395550e2e0 100644
--- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
@@ -10,6 +10,8 @@
#include "chrome/browser/ui/views/browser_actions_container.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension_action.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/extension_resource.h"
#include "content/public/test/test_utils.h"
@@ -272,10 +274,13 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
gfx::Size size(Extension::kBrowserActionIconMaxSize,
Extension::kBrowserActionIconMaxSize);
- extension->SetCachedImage(
- extension->GetResource(extension->browser_action()->default_icon_path()),
- bitmap,
- size);
+ const ExtensionIconSet* default_icon =
+ extension->browser_action()->default_icon();
+ const std::string path =
+ default_icon->Get(extension_misc::EXTENSION_ICON_ACTION,
+ ExtensionIconSet::MATCH_EXACTLY);
+
+ extension->SetCachedImage(extension->GetResource(path), bitmap, size);
LOG(INFO) << "Disabling extension\n" << std::flush;
DisableExtension(extension->id());

Powered by Google App Engine
This is Rietveld 408576698