5 files changed, 12 insertions, 16 deletions
diff --git a/chrome/browser/views/frame/browser_root_view.cc b/chrome/browser/views/frame/browser_root_view.cc
index d2985dd..e423603 100644
--- a/chrome/browser/views/frame/browser_root_view.cc
+++ b/chrome/browser/views/frame/browser_root_view.cc
@@ -9,6 +9,7 @@
 #include "app/os_exchange_data.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
+#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/frame/browser_view.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index b09242b..949b73b 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -14,6 +14,7 @@
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
@@ -555,12 +556,6 @@ gfx::Rect BrowserView::GetClientAreaBounds() const {
   return container_bounds;
 }
 
-bool BrowserView::ShouldFindBarBlendWithBookmarksBar() const {
-  if (bookmark_bar_view_.get())
-    return bookmark_bar_view_->IsAlwaysShown();
-  return false;
-}
-
 gfx::Rect BrowserView::GetFindBarBoundingBox() const {
   return GetBrowserViewLayout()->GetFindBarBoundingBox();
 }
@@ -1068,9 +1063,7 @@ views::Window* BrowserView::ShowAboutChromeDialog() {
 }
 
 void BrowserView::ShowUpdateChromeDialog() {
-#if defined(OS_WIN)
   UpdateRecommendedMessageBox::ShowMessageBox(GetWindow()->GetNativeWindow());
-#endif
 }
 
 void BrowserView::ShowTaskManager() {
@@ -1851,7 +1844,7 @@ void BrowserView::Init() {
   // Stow a pointer to this object onto the window handle so that we can get
   // at it later when all we have is a native view.
 #if defined(OS_WIN)
-  SetProp(GetWidget()->GetNativeView(), kBrowserViewKey, this);
+  GetWidget()->SetNativeWindowProperty(kBrowserViewKey, this);
 #else
   g_object_set_data(G_OBJECT(GetWidget()->GetNativeView()),
                     kBrowserViewKey, this);
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 32272ab..d113525 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -128,12 +128,6 @@ class BrowserView : public BrowserBubbleHost,
   // BrowserView's parent.
   gfx::Rect GetClientAreaBounds() const;
 
-  // Returns true if the Find Bar should be rendered such that it appears to
-  // blend with the Bookmarks Bar. False if it should appear to blend with the
-  // main Toolbar. The return value will vary depending on whether or not the
-  // Bookmark Bar is always shown.
-  bool ShouldFindBarBlendWithBookmarksBar() const;
-
   // Returns the constraining bounding box that should be used to lay out the
   // FindBar within. This is _not_ the size of the find bar, just the bounding
   // box it should be laid out within. The coordinate system of the returned
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index b532273..fdc1956 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/views/frame/browser_view.h"
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index c3c1a0a..94d0ffa 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -919,7 +919,14 @@ void OpaqueBrowserFrameView::LayoutWindowControls() {
       close_button_size.height());
 
 #if defined(OS_CHROMEOS)
-  if (is_maximized) {
+  // LayoutWindowControls could be triggered from WindowGtk::UpdateWindowTitle,
+  // which could happen when user navigates in fullscreen mode. And because
+  // BrowserFrameChromeos::IsMaximized return false for fullscreen mode, we
+  // explicitly test fullscreen mode here and make it use the same code path
+  // as maximized mode.
+  // TODO(oshima): Optimize the relayout logic to defer the frame view's
+  // relayout until it is necessary, i.e when it becomes visible.
+  if (is_maximized || frame_->GetWindow()->IsFullscreen()) {
     minimize_button_->SetVisible(false);
     restore_button_->SetVisible(false);
     maximize_button_->SetVisible(false);