UX updates for IME window.

chrome/browser/ui/views/ime/ime_window_frame_view.cc

 // Copyright 2016 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/ime/ime_window_frame_view.h"
 
 #include "chrome/browser/ui/views/ime/ime_window_view.h"
 #include "chrome/grit/browser_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
@@ skipping 10 matching lines @@
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 // The distance values for layout in DIPs.
 const int kButtonSize = 24;
 const int kBorderThickness = 1;
 const int kIconSize = 16;
-const int kTitleAndButtonPadding = 11;
 const int kTitlebarHeight = 32;
 const int kTitlebarLeftPadding = 8;
 const int kTitlebarRightPadding = 6;
 
 // Colors used to draw border, titlebar background and title text.
 const SkColor kBackgroundColor = SkColorSetRGB(0xec, 0xef, 0xf1);
 const SkColor kBorderColor = SkColorSetRGB(0xda, 0xdf, 0xe1);
-const SkColor kTitleTextColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
 
 }  // namespace
 
 namespace ui {
 
 ImeWindowFrameView::ImeWindowFrameView(ImeWindowView* ime_window_view,
                                        ImeWindow::Mode mode)
     : ime_window_view_(ime_window_view),
       mode_(mode),
       close_button_(nullptr),
-      title_icon_(nullptr),
-      title_label_(nullptr) {}
+      title_icon_(nullptr) {}
 
 ImeWindowFrameView::~ImeWindowFrameView() {}
 
 void ImeWindowFrameView::Init() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                           rb.GetImageSkiaNamed(IDR_IME_WINDOW_CLOSE));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                           rb.GetImageSkiaNamed(IDR_IME_WINDOW_CLOSE_H));
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                           rb.GetImageSkiaNamed(IDR_IME_WINDOW_CLOSE_C));
   close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                    views::ImageButton::ALIGN_MIDDLE);
   AddChildView(close_button_);
 
   title_icon_ = new views::ImageView();
   title_icon_->SetImage(ime_window_view_->GetWindowIcon());
   title_icon_->SetTooltipText(ime_window_view_->GetWindowTitle());
   AddChildView(title_icon_);
-
-  title_label_ = new views::Label(ime_window_view_->GetWindowTitle(),
-                                  rb.GetFontList(ui::ResourceBundle::BoldFont));
-  title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label_->SetAutoColorReadabilityEnabled(false);
-  AddChildView(title_label_);
-}
-
-void ImeWindowFrameView::UpdateTitle() {
-  UpdateWindowTitle();
 }
 
 void ImeWindowFrameView::UpdateIcon() {
   UpdateWindowIcon();
 }
 
 gfx::Rect ImeWindowFrameView::GetBoundsForClientView() const {
   if (in_follow_cursor_mode()) {
     return gfx::Rect(kTitlebarHeight, kBorderThickness,
                      std::max(0, width() - kTitlebarHeight - kBorderThickness),
@@ skipping 45 matching lines @@
 
   window_mask->close();
 }
 
 void ImeWindowFrameView::ResetWindowControls() {}
 
 void ImeWindowFrameView::UpdateWindowIcon() {
   title_icon_->SchedulePaint();
 }
 
-void ImeWindowFrameView::UpdateWindowTitle() {
-  title_label_->SetText(ime_window_view_->GetWindowTitle());
-}
+void ImeWindowFrameView::UpdateWindowTitle() {}
 
 void ImeWindowFrameView::SizeConstraintsChanged() {}
 
 gfx::Size ImeWindowFrameView::GetPreferredSize() const {
   gfx::Size pref_size =
       ime_window_view_->window()->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref_size.width(), pref_size.height());
   return ime_window_view_->window()
                          ->non_client_view()
                          ->GetWindowBoundsForClientBounds(bounds)
@@ skipping 12 matching lines @@
   // Layout the icon.
   // TODO(shuchen): Consider the RTL case.
   int icon_y = (kTitlebarHeight - kIconSize) / 2;
   bool follow_cursor = in_follow_cursor_mode();
   title_icon_->SetBounds(follow_cursor ? icon_y : kTitlebarLeftPadding,
                          follow_cursor ? kTitlebarLeftPadding : icon_y,
                          kIconSize, kIconSize);
 
   if (follow_cursor) {
     close_button_->SetVisible(false);
-    title_label_->SetVisible(false);
   } else {
     // Layout the close button.
-    int right = width();
     close_button_->SetBounds(width() - kTitlebarRightPadding - kButtonSize,
                              (kTitlebarHeight - kButtonSize) / 2, kButtonSize,
                              kButtonSize);
-    right = close_button_->x();
-
-    // Layout the title.
-    int title_x = title_icon_->bounds().right() + kTitleAndButtonPadding;
-    int title_height = title_label_->font_list().GetHeight();
-    title_label_->SetBounds(
-        title_x, icon_y + ((kIconSize - title_height - 1) / 2),
-        std::max(0, right - kTitleAndButtonPadding - title_x), title_height);
   }
 }
 
 void ImeWindowFrameView::OnPaint(gfx::Canvas* canvas) {
-  UpdateControlStyles();
   PaintFrameBackground(canvas);
 }
 
 bool ImeWindowFrameView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.IsOnlyLeftMouseButton()) {
     gfx::Point mouse_location = event.location();
     views::View::ConvertPointToScreen(this, &mouse_location);
     return ime_window_view_->OnTitlebarPointerPressed(
         mouse_location, ImeWindowView::PointerType::MOUSE);
   }
@@ skipping 47 matching lines @@
   if (handled)
     event->SetHandled();
 }
 
 void ImeWindowFrameView::ButtonPressed(views::Button* sender,
                                        const ui::Event& event) {
   if (sender == close_button_)
     ime_window_view_->Close();
 }
 
-void ImeWindowFrameView::UpdateControlStyles() {
-  title_label_->SetEnabledColor(kTitleTextColor);
-}
-
 void ImeWindowFrameView::PaintFrameBackground(gfx::Canvas* canvas) {
   canvas->DrawColor(kBackgroundColor);
 
   // left border.
   canvas->FillRect(gfx::Rect(0, 0, kBorderThickness, height()),
                    kBorderColor);
   // top border.
   canvas->FillRect(gfx::Rect(0, 0, width(), kBorderThickness),
                    kBorderColor);
   // right border.
   canvas->FillRect(gfx::Rect(width() - kBorderThickness, 0, kBorderThickness,
                              height()),
                    kBorderColor);
   // bottom border.
   canvas->FillRect(gfx::Rect(0, height() - kBorderThickness, width(),
                              kBorderThickness),
                    kBorderColor);
 }
 
 }  // namespace ui