Revert 262516 "Remove title and icon from chrome apps native style title bars."

chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.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"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h"
-#endif
-
 class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
  public:
   ShapedAppWindowTargeterTest()
       : web_view_(NULL) {
   }
 
   virtual ~ShapedAppWindowTargeterTest() {}
 
   views::Widget* widget() { return widget_.get(); }
 
@@ skipping 18 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
   }
 
  private:
   views::WebView web_view_;
   scoped_ptr<views::Widget> widget_;
-#if defined(OS_WIN)
-  ChromeNativeAppWindowViewsWin app_window_;
-#else
   ChromeNativeAppWindowViews app_window_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
 };
 
 TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
   aura::Window* window = widget()->GetNativeWindow();
   {
     // Without any custom shapes, the event should be targeted correctly to the
     // window.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
@@ skipping 114 matching lines @@
     // |window| as its target.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
                         gfx::Point(32, 37), gfx::Point(32, 37),
                         ui::EF_NONE, ui::EF_NONE);
     ui::EventDispatchDetails details =
         event_processor()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 
-#if defined(OS_WIN)
-  // On Windows the non standard app frame has a easy resize targetter
-  // installed.
-  app_window_views()->CreateNonStandardAppFrame();
+  // The EasyResizeTargeter specifies an inset of 5px within the window.
+  app_window_views()->InstallEasyResizeTargeterOnContainer();
+
   {
     // An event in the center of the window should always have
     // |window| as its target.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
                         gfx::Point(80, 80), gfx::Point(80, 80),
                         ui::EF_NONE, ui::EF_NONE);
     ui::EventDispatchDetails details =
         event_processor()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
   {
     // With an EasyResizeTargeter on the container, an event
     // inside the window and within 5px of an edge should have
     // root_window() as its target.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
                         gfx::Point(32, 37), gfx::Point(32, 37),
                         ui::EF_NONE, ui::EF_NONE);
     ui::EventDispatchDetails details =
         event_processor()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
   }
-#endif  // defined (OS_WIN)
 }