Fix find bar positioning for hosted app windows

chrome/browser/ui/views/frame/browser_view_unittest.cc

 // Copyright 2013 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/frame/browser_view.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
@@ skipping 85 matching lines @@
   gfx::Point expected_tabstrip_origin = ExpectedTabStripOrigin(browser_view());
   EXPECT_EQ(expected_tabstrip_origin.x(), tabstrip->x());
   EXPECT_EQ(expected_tabstrip_origin.y(), tabstrip->y());
   EXPECT_EQ(0, toolbar->x());
   EXPECT_EQ(
       tabstrip->bounds().bottom() -
           BrowserViewLayout::kToolbarTabStripVerticalOverlap,
       toolbar->y());
   EXPECT_EQ(0, contents_container->x());
   EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());
+  EXPECT_EQ(top_container->bounds().bottom(), contents_container->y());
   EXPECT_EQ(0, devtools_web_view->x());
   EXPECT_EQ(0, devtools_web_view->y());
   EXPECT_EQ(0, contents_web_view->x());
   EXPECT_EQ(0, contents_web_view->y());
 
   // Verify bookmark bar visibility.
   BookmarkBarView* bookmark_bar = browser_view()->GetBookmarkBarView();
   EXPECT_FALSE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
   chrome::ExecuteCommand(browser, IDC_SHOW_BOOKMARK_BAR);
@@ skipping 41 matching lines @@
   EXPECT_FALSE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
   EXPECT_EQ(top_container, bookmark_bar->parent());
   // Top container is still second from front.
   EXPECT_EQ(browser_view()->child_count() - 2,
             browser_view()->GetIndexOf(top_container));
 
   BookmarkBarView::DisableAnimationsForTesting(false);
 }
 
+class BrowserViewHostedAppTest : public TestWithBrowserView {
+ public:
+  BrowserViewHostedAppTest()
+      : TestWithBrowserView(Browser::TYPE_POPUP,
+                            chrome::HOST_DESKTOP_TYPE_NATIVE,
+                            true) {
+  }
+  virtual ~BrowserViewHostedAppTest() {
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BrowserViewHostedAppTest);
+};
+
+// Test basic layout for hosted apps.
+TEST_F(BrowserViewHostedAppTest, Layout) {
+  // Add a tab because the browser starts out without any tabs at all.
+  AddTab(browser(), GURL("about:blank"));
+
+  views::View* contents_container =
+      browser_view()->GetContentsContainerForTest();
+
+  // The tabstrip, toolbar and bookmark bar should not be visible for hosted
+  // apps.
+  EXPECT_FALSE(browser_view()->tabstrip()->visible());
+  EXPECT_FALSE(browser_view()->toolbar()->visible());
+  EXPECT_FALSE(browser_view()->IsBookmarkBarVisible());
+
+  gfx::Point header_offset;
+  views::View::ConvertPointToTarget(
+      browser_view(),
+      browser_view()->frame()->non_client_view()->frame_view(),
+      &header_offset);
+
+  // The position of the bottom of the header (the bar with the window
+  // controls) in the coordinates of BrowserView.
+  int bottom_of_header = browser_view()->frame()->GetTopInset() -
+      header_offset.y();
+
+  // The web contents should be flush with the bottom of the header.
+  EXPECT_EQ(bottom_of_header, contents_container->y());
+
+  // The find bar should overlap the 1px header/web-contents separator at the
+  // bottom of the header.
+  EXPECT_EQ(browser_view()->frame()->GetTopInset() - 1,
+            browser_view()->GetFindBarBoundingBox().y());
+}
+
 #if defined(OS_WIN)
 
 // This class provides functionality to test the incognito window/normal window
 // switcher button which is added to Windows 8 metro Chrome.
 // We create the BrowserView ourselves in the
 // BrowserWithTestWindowTest::CreateBrowserWindow function override and add the
 // switcher button to the view. We also provide an incognito profile to ensure
 // that the switcher button is visible.
 class BrowserViewIncognitoSwitcherTest : public TestWithBrowserView {
  public:
@@ skipping 81 matching lines @@
   // Test initial state.
   EXPECT_TRUE(browser_view()->IsTabStripVisible());
   // Validate whether the window switcher button is the target for the position
   // passed in.
   gfx::Point switcher_point(browser_view()->window_switcher_button()->x() + 2,
                             browser_view()->window_switcher_button()->y());
   EXPECT_EQ(browser_view()->GetEventHandlerForPoint(switcher_point),
             browser_view()->window_switcher_button());
 }
 #endif