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

Unified Diff: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

Issue 213743017: Remove title and icon from chrome apps native style title bars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed leak in test Created 6 years, 8 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
« no previous file with comments | « chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
index cd4d8c2ee43ed3d18ce8ff9cd412ba4bb5fefb7a..7bac67cbe60d018728347f766afe1dbdd4d971aa 100644
--- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
+++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
+#include "apps/ui/views/app_window_frame_view.h"
#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/window.h"
@@ -184,9 +185,10 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
EXPECT_EQ(window, move.target());
}
- // The EasyResizeTargeter specifies an inset of 5px within the window.
- app_window_views()->InstallEasyResizeTargeterOnContainer();
-
+#if !defined(OS_CHROMEOS)
+ // The non standard app frame has a easy resize targetter installed.
+ scoped_ptr<apps::AppWindowFrameView> frame(
+ app_window_views()->CreateNonStandardAppFrame());
{
// Ensure that the window has an event targeter (there should be an
// EasyResizeWindowTargeter installed).
@@ -223,4 +225,5 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
ASSERT_FALSE(details.dispatcher_destroyed);
EXPECT_EQ(window, move.target());
}
+#endif // defined (OS_CHROMEOS)
}
« no previous file with comments | « chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698