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

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

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 11 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 3849eebf2342e35df1f020213827621db72271f2..a54b25982f28de355a7496d5ebadd375da3f1dd1 100644
--- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/extension_resource.h"
@@ -265,14 +266,14 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
// Create and cache and empty bitmap.
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config,
- Extension::kBrowserActionIconMaxSize,
- Extension::kBrowserActionIconMaxSize);
+ extensions::IconsInfo::kBrowserActionIconMaxSize,
+ extensions::IconsInfo::kBrowserActionIconMaxSize);
bitmap.allocPixels();
LOG(INFO) << "Set as cached image\n" << std::flush;
- gfx::Size size(Extension::kBrowserActionIconMaxSize,
- Extension::kBrowserActionIconMaxSize);
+ gfx::Size size(extensions::IconsInfo::kBrowserActionIconMaxSize,
+ extensions::IconsInfo::kBrowserActionIconMaxSize);
const ExtensionIconSet* default_icon =
extensions::ExtensionActionManager::Get(browser()->profile())->
GetBrowserAction(*extension)->default_icon();

Powered by Google App Engine
This is Rietveld 408576698