Revert "Fix some DefaultFrameHeader semantics."

This reverts commit 1ee2c9ad.

Reason for revert: sorry, let me revert this one too to successfully
revert the other one. (This can probably be re-landed after that)

Original change's description:
> Fix some DefaultFrameHeader semantics.
> 
> This CL removes back button as a constructor arg and renames the
> setters for the back button and the left header view to set_property to
> clarify the semantics of the methods.
> 
> Bug: None
> Change-Id: Ia73a173696ff434bc4e96168c82ed95fce6dd6e9
> Reviewed-on: https://chromium-review.googlesource.com/778265
> Commit-Queue: calamity <calamity@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Reviewed-by: Trent Apted <tapted@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#519599}

TBR=jamescook@chromium.org,tapted@chromium.org,calamity@chromium.org

Change-Id: I43ef07f352e96d1040594066822449d806c4e91e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/792734
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519642}

ash/frame/default_frame_header.cc

@@ -75,11 +75,12 @@ DefaultFrameHeader::DefaultFrameHeader(
     views::Widget* frame,
     views::View* header_view,
     FrameCaptionButtonContainerView* caption_button_container,
+    FrameCaptionButton* back_button,
     mojom::WindowStyle window_style)
     : window_style_(window_style),
       frame_(frame),
       view_(header_view),
-      back_button_(nullptr),
+      back_button_(back_button),
       left_header_view_(nullptr),
       active_frame_color_(kDefaultFrameColor),
       inactive_frame_color_(kDefaultFrameColor),
@@ -239,6 +240,14 @@ bool DefaultFrameHeader::ShouldUseLightImages() const {
                                                     : active_frame_color_);
 }
 
+void DefaultFrameHeader::UpdateLeftHeaderView(views::View* left_header_view) {
+  left_header_view_ = left_header_view;
+}
+
+void DefaultFrameHeader::UpdateBackButton(FrameCaptionButton* button) {
+  back_button_ = button;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 

ash/frame/default_frame_header.h

@@ -39,6 +39,7 @@ class ASH_EXPORT DefaultFrameHeader : public FrameHeader,
       views::Widget* frame,
       views::View* header_view,
       FrameCaptionButtonContainerView* caption_button_container,
+      FrameCaptionButton* back_button,
       mojom::WindowStyle window_style = mojom::WindowStyle::DEFAULT);
   ~DefaultFrameHeader() override;
 
@@ -52,13 +53,12 @@ class ASH_EXPORT DefaultFrameHeader : public FrameHeader,
   void SchedulePaintForTitle() override;
   void SetPaintAsActive(bool paint_as_active) override;
 
-  void set_left_header_view(views::View* left_header_view) {
-    left_header_view_ = left_header_view;
-  }
+  // Sets the left header view for the header. Passing |nullptr| removes the
+  // view.
+  void UpdateLeftHeaderView(views::View* left_header_view);
 
-  void set_back_button(FrameCaptionButton* back_button) {
-    back_button_ = back_button;
-  }
+  // Sets the back button for the header. Passing |nullptr| removes the view.
+  void UpdateBackButton(FrameCaptionButton* button);
 
   // Sets the active and inactive frame colors. Note the inactive frame color
   // will have some transparency added when the frame is drawn.

ash/frame/default_frame_header_unittest.cc

@@ -32,8 +32,8 @@ TEST_F(DefaultFrameHeaderTest, TitleIconAlignment) {
   w->Show();
 
   DefaultFrameHeader frame_header(w.get(), w->non_client_view()->frame_view(),
-                                  &container);
-  frame_header.set_left_header_view(&window_icon);
+                                  &container, nullptr);
+  frame_header.UpdateLeftHeaderView(&window_icon);
   frame_header.LayoutHeader();
   gfx::Rect title_bounds = frame_header.GetAvailableTitleBounds();
   EXPECT_EQ(window_icon.bounds().CenterPoint().y(),
@@ -47,8 +47,8 @@ TEST_F(DefaultFrameHeaderTest, BackButtonAlignment) {
   FrameBackButton back;
 
   DefaultFrameHeader frame_header(w.get(), w->non_client_view()->frame_view(),
-                                  &container);
-  frame_header.set_back_button(&back);
+                                  &container, nullptr);
+  frame_header.UpdateBackButton(&back);
   frame_header.LayoutHeader();
   gfx::Rect title_bounds = frame_header.GetAvailableTitleBounds();
   // The back button should be positioned at the left edge, and
@@ -68,7 +68,7 @@ TEST_F(DefaultFrameHeaderTest, LightIcons) {
   w->Show();
 
   DefaultFrameHeader frame_header(w.get(), w->non_client_view()->frame_view(),
-                                  &container);
+                                  &container, nullptr);
 
   // Check by default light icons are not used.
   frame_header.mode_ = FrameHeader::MODE_ACTIVE;

ash/frame/header_view.cc

@@ -31,7 +31,7 @@ HeaderView::HeaderView(views::Widget* target_widget,
   AddChildView(caption_button_container_);
 
   frame_header_ = std::make_unique<DefaultFrameHeader>(
-      target_widget_, this, caption_button_container_, window_style);
+      target_widget_, this, caption_button_container_, nullptr, window_style);
 
   Shell::Get()->tablet_mode_controller()->AddObserver(this);
 }
@@ -89,7 +89,7 @@ void HeaderView::SetAvatarIcon(const gfx::ImageSkia& avatar) {
     }
     avatar_icon_->SetImage(avatar);
   }
-  frame_header_->set_left_header_view(avatar_icon_);
+  frame_header_->UpdateLeftHeaderView(avatar_icon_);
   Layout();
 }
 
@@ -104,7 +104,7 @@ void HeaderView::SetBackButtonState(FrameBackButtonState state) {
     delete back_button_;
     back_button_ = nullptr;
   }
-  frame_header_->set_back_button(back_button_);
+  frame_header_->UpdateBackButton(back_button_);
   Layout();
 }
 

ash/wm/panels/panel_frame_view.cc

@@ -52,14 +52,14 @@ void PanelFrameView::InitFrameHeader() {
   AddChildView(caption_button_container_);
 
   frame_header_ = std::make_unique<DefaultFrameHeader>(
-      frame_, this, caption_button_container_);
+      frame_, this, caption_button_container_, nullptr);
   GetWidgetWindow()->SetProperty(aura::client::kTopViewColor,
                                  frame_header_->GetInactiveFrameColor());
 
   if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
     window_icon_ = new views::ImageView();
     AddChildView(window_icon_);
-    frame_header_->set_left_header_view(window_icon_);
+    frame_header_->UpdateLeftHeaderView(window_icon_);
   }
 }
 

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

@@ -511,7 +511,7 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
           browser)) {
     default_frame_header = std::make_unique<HostedAppFrameHeaderAsh>(
         browser->hosted_app_controller(), frame(), this,
-        caption_button_container_);
+        caption_button_container_, back_button_);
 
     // Add the container for extra hosted app buttons (e.g app menu button).
     SkColor button_color = ash::FrameCaptionButton::GetButtonColor(
@@ -523,7 +523,7 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
     caption_button_container_->AddChildViewAt(hosted_app_button_container_, 0);
   } else {
     default_frame_header = std::make_unique<ash::DefaultFrameHeader>(
-        frame(), this, caption_button_container_);
+        frame(), this, caption_button_container_, back_button_);
     if (!browser->is_app()) {
       // For non app (i.e. WebUI) windows (e.g. Settings) use MD frame color.
       default_frame_header->SetFrameColors(kMdWebUIFrameColor,
@@ -531,11 +531,8 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
     }
   }
 
-  if (back_button_)
-    default_frame_header->set_back_button(back_button_);
-
   if (window_icon_)
-    default_frame_header->set_left_header_view(window_icon_);
+    default_frame_header->UpdateLeftHeaderView(window_icon_);
 
   return default_frame_header;
 }

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

@@ -17,8 +17,12 @@ HostedAppFrameHeaderAsh::HostedAppFrameHeaderAsh(
     extensions::HostedAppBrowserController* app_controller,
     views::Widget* frame,
     views::View* header_view,
-    ash::FrameCaptionButtonContainerView* caption_button_container)
-    : DefaultFrameHeader(frame, header_view, caption_button_container),
+    ash::FrameCaptionButtonContainerView* caption_button_container,
+    ash::FrameCaptionButton* back_button)
+    : DefaultFrameHeader(frame,
+                         header_view,
+                         caption_button_container,
+                         back_button),
       app_controller_(app_controller),
       app_name_(base::UTF8ToUTF16(app_controller->GetAppShortName())),
       app_and_domain_(l10n_util::GetStringFUTF16(

chrome/browser/ui/views/frame/hosted_app_frame_header_ash.h

@@ -25,7 +25,8 @@ class HostedAppFrameHeaderAsh : public ash::DefaultFrameHeader {
       extensions::HostedAppBrowserController* app_controller,
       views::Widget* frame,
       views::View* header_view,
-      ash::FrameCaptionButtonContainerView* caption_button_container);
+      ash::FrameCaptionButtonContainerView* caption_button_container,
+      ash::FrameCaptionButton* back_button);
   ~HostedAppFrameHeaderAsh() override;
 
  private: