diff options
| author | jackhou <jackhou@chromium.org> | 2015-01-07 22:57:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-08 06:58:17 +0000 |
| commit | 81ffda4e81e44f6e6a1b184341da73e1604c988a (patch) | |
| tree | 02952f379ab89a85d54d4d1aff46f36eace168ea | |
| parent | 8a16c6beb41ac163dd7a05fe318b5bdd4102fb10 (diff) | |
| download | chromium_src-81ffda4e81e44f6e6a1b184341da73e1604c988a.zip chromium_src-81ffda4e81e44f6e6a1b184341da73e1604c988a.tar.gz chromium_src-81ffda4e81e44f6e6a1b184341da73e1604c988a.tar.bz2 | |
[MacViews] Fix BrowserActionApiTest.DynamicBrowserAction.
When toolkit-views becomes available on Mac, the browser will still
use the Cocoa UI.
BUG=404979
Review URL: https://codereview.chromium.org/821753004
Cr-Commit-Position: refs/heads/master@{#310459}
| -rw-r--r-- | chrome/browser/extensions/api/extension_action/browser_action_apitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 512de3b..1d529ef 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -50,7 +50,7 @@ const char kEmptyPathError[] = "The path property must not be empty."; // Views implementation of browser action button will return icon whose // background will be set. gfx::ImageSkia AddBackgroundForViews(const gfx::ImageSkia& icon) { -#if defined(TOOLKIT_VIEWS) +#if !defined(OS_MACOSX) ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); gfx::ImageSkia bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION); return gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon); |