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

Unified Diff: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

Issue 232483005: Enable --high-dpi-support by default. Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disabling broken unit tests. (Don't submit this code!) Created 6 years, 7 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/extensions/api/extension_action/browser_action_apitest.cc
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 1aacf4982c8d1bbbdb4d7261baff454ce1356af5..7ac0c4207c6283dcbcfdfd54b3df92c441c99878 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -32,6 +32,9 @@
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skia_util.h"
+#if defined(OS_WIN)
+#include "ui/gfx/win/dpi.h"
+#endif
using content::WebContents;
@@ -124,6 +127,12 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
}
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
+#if defined(OS_WIN)
+ // High DPI breaks multi-resolution handling. Bail.
+ if (gfx::IsHighDPIEnabled())
+ return;
+#endif
+
ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/extensions/extension_icon_image_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698