Compute minimum widths for the toolbar components.

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

 // Copyright (c) 2012 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/omnibox/omnibox_view_views.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 42 matching lines @@
 #include "ui/views/ime/input_method.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/browser_process.h"
 #endif
 
+
 namespace {
 
+// OmniboxState ---------------------------------------------------------------
+
 // Stores omnibox state for each tab.
 struct OmniboxState : public base::SupportsUserData::Data {
   static const char kKey[];
 
   OmniboxState(const OmniboxEditModel::State& model_state,
                const gfx::Range& selection,
                const gfx::Range& saved_selection_for_focus_change);
   virtual ~OmniboxState();
 
   const OmniboxEditModel::State model_state;
@@ skipping 10 matching lines @@
 const char OmniboxState::kKey[] = "OmniboxState";
 
 OmniboxState::OmniboxState(const OmniboxEditModel::State& model_state,
                            const gfx::Range& selection,
                            const gfx::Range& saved_selection_for_focus_change)
     : model_state(model_state),
       selection(selection),
       saved_selection_for_focus_change(saved_selection_for_focus_change) {
 }
 
-OmniboxState::~OmniboxState() {}
+OmniboxState::~OmniboxState() {
+}
+
+
+// Helpers --------------------------------------------------------------------
 
 // We'd like to set the text input type to TEXT_INPUT_TYPE_URL, because this
 // triggers URL-specific layout in software keyboards, e.g. adding top-level "/"
 // and ".com" keys for English.  However, this also causes IMEs to default to
 // Latin character mode, which makes entering search queries difficult for IME
 // users.  Therefore, we try to guess whether an IME will be used based on the
 // application language, and set the input type accordingly.
 ui::TextInputType DetermineTextInputType() {
 #if defined(OS_WIN)
   DCHECK(g_browser_process);
   const std::string& locale = g_browser_process->GetApplicationLocale();
   const std::string& language = locale.substr(0, 2);
   // Assume CJK + Thai users are using an IME.
   if (language == "ja" ||
       language == "ko" ||
       language == "th" ||
       language == "zh")
     return ui::TEXT_INPUT_TYPE_SEARCH;
 #endif
   return ui::TEXT_INPUT_TYPE_URL;
 }
 
 }  // namespace
 
+
+// OmniboxViewViews -----------------------------------------------------------
+
 // static
 const char OmniboxViewViews::kViewClassName[] = "OmniboxViewViews";
 
 OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
                                    Profile* profile,
                                    CommandUpdater* command_updater,
                                    bool popup_window_mode,
                                    LocationBarView* location_bar,
                                    const gfx::FontList& font_list)
     : OmniboxView(profile, controller, command_updater),
@@ skipping 15 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager::Get()->
       RemoveCandidateWindowObserver(this);
 #endif
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
   popup_view_.reset();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews public:
-
 void OmniboxViewViews::Init() {
   set_controller(this);
   SetTextInputType(DetermineTextInputType());
 
   if (popup_window_mode_)
     SetReadOnly(true);
 
   // Initialize the popup view using the same font.
   popup_view_.reset(OmniboxPopupContentsView::Create(
       GetFontList(), this, model(), location_bar_view_));
 
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager::Get()->
       AddCandidateWindowObserver(this);
 #endif
 
   fade_in_animation_.reset(new gfx::SlideAnimation(this));
   fade_in_animation_->SetTweenType(gfx::Tween::LINEAR);
   fade_in_animation_->SetSlideDuration(300);
 }
 
 void OmniboxViewViews::FadeIn() {
   fade_in_animation_->Show();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, public OmniboxView implementation:
-
 void OmniboxViewViews::SaveStateToTab(content::WebContents* tab) {
   DCHECK(tab);
 
   // We don't want to keep the IME status, so force quit the current
   // session here.  It may affect the selection status, so order is
   // also important.
   if (IsIMEComposing()) {
     GetTextInputClient()->ConfirmCompositionText();
     GetInputMethod()->CancelComposition(this);
   }
@@ skipping 112 matching lines @@
 int OmniboxViewViews::GetTextWidth() const {
   // Returns the width necessary to display the current text, including any
   // necessary space for the cursor or border/margin.
   return GetRenderText()->GetContentWidth() + GetInsets().width();
 }
 
 bool OmniboxViewViews::IsImeComposing() const {
   return IsIMEComposing();
 }
 
+gfx::Size OmniboxViewViews::GetMinimumSize() {
+  const int kMinCharacters = 10;
+  return gfx::Size(
+      GetFontList().GetExpectedTextWidth(kMinCharacters) + GetInsets.width(),
+      GetPreferredSize().height());
+}
+
+void OmniboxViewViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  views::Textfield::OnNativeThemeChanged(theme);
+  SetBackgroundColor(location_bar_view_->GetColor(
+      ToolbarModel::NONE, LocationBarView::BACKGROUND));
+  EmphasizeURLComponents();
+}
+
 void OmniboxViewViews::ExecuteCommand(int command_id, int event_flags) {
   switch (command_id) {
     // These commands don't invoke the popup via OnBefore/AfterPossibleChange().
     case IDS_PASTE_AND_GO:
       model()->PasteAndGo(GetClipboardText());
       break;
     case IDS_SHOW_URL:
       controller()->ShowURL();
       break;
     case IDC_EDIT_SEARCH_ENGINES:
@@ skipping 10 matching lines @@
         OnPaste();
       else if (Textfield::IsCommandIdEnabled(command_id))
         Textfield::ExecuteCommand(command_id, event_flags);
       else
         command_updater()->ExecuteCommand(command_id);
       OnAfterPossibleChange();
       break;
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private:
-
-int OmniboxViewViews::GetOmniboxTextLength() const {
-  // TODO(oshima): Support IME.
-  return static_cast<int>(text().length());
-}
-
-void OmniboxViewViews::EmphasizeURLComponents() {
-  // See whether the contents are a URL with a non-empty host portion, which we
-  // should emphasize.  To check for a URL, rather than using the type returned
-  // by Parse(), ask the model, which will check the desired page transition for
-  // this input.  This can tell us whether an UNKNOWN input string is going to
-  // be treated as a search or a navigation, and is the same method the Paste
-  // And Go system uses.
-  url::Component scheme, host;
-  AutocompleteInput::ParseForEmphasizeComponents(text(), &scheme, &host);
-  bool grey_out_url = text().substr(scheme.begin, scheme.len) ==
-      base::UTF8ToUTF16(extensions::kExtensionScheme);
-  bool grey_base = model()->CurrentTextIsURL() &&
-      (host.is_nonempty() || grey_out_url);
-  SetColor(location_bar_view_->GetColor(
-      security_level_,
-      grey_base ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT));
-  if (grey_base && !grey_out_url) {
-    ApplyColor(
-        location_bar_view_->GetColor(security_level_, LocationBarView::TEXT),
-        gfx::Range(host.begin, host.end()));
-  }
-
-  // Emphasize the scheme for security UI display purposes (if necessary).
-  // Note that we check CurrentTextIsURL() because if we're replacing search
-  // URLs with search terms, we may have a non-URL even when the user is not
-  // editing; and in some cases, e.g. for "site:foo.com" searches, the parser
-  // may have incorrectly identified a qualifier as a scheme.
-  SetStyle(gfx::DIAGONAL_STRIKE, false);
-  if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
-      scheme.is_nonempty() && (security_level_ != ToolbarModel::NONE)) {
-    SkColor security_color = location_bar_view_->GetColor(
-        security_level_, LocationBarView::SECURITY_TEXT);
-    const bool strike = (security_level_ == ToolbarModel::SECURITY_ERROR);
-    const gfx::Range scheme_range(scheme.begin, scheme.end());
-    ApplyColor(security_color, scheme_range);
-    ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
-  }
-}
-
 void OmniboxViewViews::SetTextAndSelectedRange(const base::string16& text,

[Greg Billock, 2014/05/13 16:08:15]

These are all just re-ordered, right?

[Peter Kasting, 2014/05/13 20:50:14]

Yes.  The only functional change is the addition of GetMinimumSize().

                                                const gfx::Range& range) {
   SetText(text);
   SelectRange(range);
 }
 
 base::string16 OmniboxViewViews::GetSelectedText() const {
   // TODO(oshima): Support IME.
   return views::Textfield::GetSelectedText();
 }
 
@@ skipping 25 matching lines @@
       } else {
         model()->OnUpOrDownKeyPressed(event.IsShiftDown() ? -1 : 1);
       }
       return true;
     }
   }
 
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private View implementation:
-
-void OmniboxViewViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  views::Textfield::OnNativeThemeChanged(theme);
-  SetBackgroundColor(location_bar_view_->GetColor(
-      ToolbarModel::NONE, LocationBarView::BACKGROUND));
-  EmphasizeURLComponents();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private OmniboxView implementation:
-
 void OmniboxViewViews::SetWindowTextAndCaretPos(const base::string16& text,
                                                 size_t caret_pos,
                                                 bool update_popup,
                                                 bool notify_text_changed) {
   const gfx::Range range(caret_pos, caret_pos);
   SetTextAndSelectedRange(text, range);
 
   if (update_popup)
     UpdatePopup();
 
@@ skipping 142 matching lines @@
   GetInputMethod()->ShowImeIfNeeded();
 }
 
 void OmniboxViewViews::OnMatchOpened(const AutocompleteMatch& match,
                                      Profile* profile,
                                      content::WebContents* web_contents) const {
   extensions::MaybeShowExtensionControlledSearchNotification(
       profile, web_contents, match);
 }
 
-bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
-  if (command_id == IDS_APP_PASTE)
-    return !read_only() && !GetClipboardText().empty();
-  if (command_id == IDS_PASTE_AND_GO)
-    return !read_only() && model()->CanPasteAndGo(GetClipboardText());
-  if (command_id == IDS_SHOW_URL)
-    return controller()->GetToolbarModel()->WouldReplaceURL();
-  return command_id == IDS_MOVE_DOWN || command_id == IDS_MOVE_UP ||
-         Textfield::IsCommandIdEnabled(command_id) ||
-         command_updater()->IsCommandEnabled(command_id);
+int OmniboxViewViews::GetOmniboxTextLength() const {
+  // TODO(oshima): Support IME.
+  return static_cast<int>(text().length());
+}
+
+void OmniboxViewViews::EmphasizeURLComponents() {
+  // See whether the contents are a URL with a non-empty host portion, which we
+  // should emphasize.  To check for a URL, rather than using the type returned
+  // by Parse(), ask the model, which will check the desired page transition for
+  // this input.  This can tell us whether an UNKNOWN input string is going to
+  // be treated as a search or a navigation, and is the same method the Paste
+  // And Go system uses.
+  url::Component scheme, host;
+  AutocompleteInput::ParseForEmphasizeComponents(text(), &scheme, &host);
+  bool grey_out_url = text().substr(scheme.begin, scheme.len) ==
+      base::UTF8ToUTF16(extensions::kExtensionScheme);
+  bool grey_base = model()->CurrentTextIsURL() &&
+      (host.is_nonempty() || grey_out_url);
+  SetColor(location_bar_view_->GetColor(
+      security_level_,
+      grey_base ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT));
+  if (grey_base && !grey_out_url) {
+    ApplyColor(
+        location_bar_view_->GetColor(security_level_, LocationBarView::TEXT),
+        gfx::Range(host.begin, host.end()));
+  }
+
+  // Emphasize the scheme for security UI display purposes (if necessary).
+  // Note that we check CurrentTextIsURL() because if we're replacing search
+  // URLs with search terms, we may have a non-URL even when the user is not
+  // editing; and in some cases, e.g. for "site:foo.com" searches, the parser
+  // may have incorrectly identified a qualifier as a scheme.
+  SetStyle(gfx::DIAGONAL_STRIKE, false);
+  if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
+      scheme.is_nonempty() && (security_level_ != ToolbarModel::NONE)) {
+    SkColor security_color = location_bar_view_->GetColor(
+        security_level_, LocationBarView::SECURITY_TEXT);
+    const bool strike = (security_level_ == ToolbarModel::SECURITY_ERROR);
+    const gfx::Range scheme_range(scheme.begin, scheme.end());
+    ApplyColor(security_color, scheme_range);
+    ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
+  }
+}
+
+bool OmniboxViewViews::OnKeyReleased(const ui::KeyEvent& event) {
+  // The omnibox contents may change while the control key is pressed.
+  if (event.key_code() == ui::VKEY_CONTROL)
+    model()->OnControlKeyChanged(false);
+  return views::Textfield::OnKeyReleased(event);
 }
 
 bool OmniboxViewViews::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDS_PASTE_AND_GO;
 }
 
 base::string16 OmniboxViewViews::GetLabelForCommandId(int command_id) const {
   DCHECK_EQ(IDS_PASTE_AND_GO, command_id);
   return l10n_util::GetStringUTF16(
       model()->IsPasteAndSearch(GetClipboardText()) ?
           IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private views::Textfield implementation:
-
 const char* OmniboxViewViews::GetClassName() const {
   return kViewClassName;
 }
 
-void OmniboxViewViews::OnPaint(gfx::Canvas* canvas) {
-  if (fade_in_animation_->is_animating()) {
-    canvas->SaveLayerAlpha(static_cast<uint8>(
-        fade_in_animation_->CurrentValueBetween(0, 255)));
-    views::Textfield::OnPaint(canvas);
-    canvas->Restore();
-  } else {
-    views::Textfield::OnPaint(canvas);
-  }
-}
-
 bool OmniboxViewViews::OnMousePressed(const ui::MouseEvent& event) {
   select_all_on_mouse_release_ =
       (event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
       (!HasFocus() || (model()->focus_state() == OMNIBOX_FOCUS_INVISIBLE));
   if (select_all_on_mouse_release_) {
     // Restore caret visibility whenever the user clicks in the omnibox in a way
     // that would give it focus.  We must handle this case separately here
     // because if the omnibox currently has invisible focus, the mouse event
     // won't trigger either SetFocus() or OmniboxEditModel::OnSetFocus().
     model()->SetCaretVisibility(true);
@@ skipping 92 matching lines @@
         return true;
       }
       break;
     default:
       break;
   }
 
   return views::Textfield::OnKeyPressed(event) || HandleEarlyTabActions(event);
 }
 
-bool OmniboxViewViews::OnKeyReleased(const ui::KeyEvent& event) {
-  // The omnibox contents may change while the control key is pressed.
-  if (event.key_code() == ui::VKEY_CONTROL)
-    model()->OnControlKeyChanged(false);
-  return views::Textfield::OnKeyReleased(event);
-}
-
 void OmniboxViewViews::OnGestureEvent(ui::GestureEvent* event) {
   if (!HasFocus() && event->type() == ui::ET_GESTURE_TAP_DOWN) {
     select_all_on_gesture_tap_ = true;
 
     // If we're trying to select all on tap, invalidate any saved selection lest
     // restoring it fights with the "select all" action.
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
   }
 
   if (select_all_on_gesture_tap_ && event->type() == ui::ET_GESTURE_TAP)
@@ skipping 27 matching lines @@
     return true;
   }
   return Textfield::SkipDefaultKeyEventProcessing(event);
 }
 
 void OmniboxViewViews::GetAccessibleState(ui::AXViewState* state) {
   location_bar_view_->GetAccessibleState(state);
   state->role = ui::AX_ROLE_TEXT_FIELD;
 }
 
+void OmniboxViewViews::OnPaint(gfx::Canvas* canvas) {
+  if (fade_in_animation_->is_animating()) {
+    canvas->SaveLayerAlpha(static_cast<uint8>(
+        fade_in_animation_->CurrentValueBetween(0, 255)));
+    views::Textfield::OnPaint(canvas);
+    canvas->Restore();
+  } else {
+    views::Textfield::OnPaint(canvas);
+  }
+}
+
 void OmniboxViewViews::OnFocus() {
   views::Textfield::OnFocus();
   // TODO(oshima): Get control key state.
   model()->OnSetFocus(false);
   // Don't call controller()->OnSetFocus, this view has already acquired focus.
 
   // Restore the selection we saved in OnBlur() if it's still valid.
   if (saved_selection_for_focus_change_.IsValid()) {
     SelectRange(saved_selection_for_focus_change_);
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
@@ skipping 22 matching lines @@
 
   // Ignore loss of focus if we lost focus because the website settings popup
   // is open. When the popup is destroyed, focus will return to the Omnibox.
   if (!WebsiteSettingsPopupView::IsPopupShowing())
     OnDidKillFocus();
 
   // Make sure the beginning of the text is visible.
   SelectRange(gfx::Range(0));
 }
 
+bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
+  if (command_id == IDS_APP_PASTE)
+    return !read_only() && !GetClipboardText().empty();
+  if (command_id == IDS_PASTE_AND_GO)
+    return !read_only() && model()->CanPasteAndGo(GetClipboardText());
+  if (command_id == IDS_SHOW_URL)
+    return controller()->GetToolbarModel()->WouldReplaceURL();
+  return command_id == IDS_MOVE_DOWN || command_id == IDS_MOVE_UP ||
+         Textfield::IsCommandIdEnabled(command_id) ||
+         command_updater()->IsCommandEnabled(command_id);
+}
+
 base::string16 OmniboxViewViews::GetSelectionClipboardText() const {
   return SanitizeTextForPaste(Textfield::GetSelectionClipboardText());
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private gfx::AnimationDelegate implementation:
-
 void OmniboxViewViews::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
 void OmniboxViewViews::AnimationEnded(const gfx::Animation* animation) {
   fade_in_animation_->Reset();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews,
-// chromeos::input_method::InputMethodManager::CandidateWindowObserver
-// private implementation:
-
 #if defined(OS_CHROMEOS)
 void OmniboxViewViews::CandidateWindowOpened(
       chromeos::input_method::InputMethodManager* manager) {
   ime_candidate_window_open_ = true;
 }
 
 void OmniboxViewViews::CandidateWindowClosed(
       chromeos::input_method::InputMethodManager* manager) {
   ime_candidate_window_open_ = false;
 }
 #endif
 
-////////////////////////////////////////////////////////////////////////////////
-// OmniboxViewViews, private views::TextfieldController implementation:
-
 void OmniboxViewViews::ContentsChanged(views::Textfield* sender,
                                        const base::string16& new_contents) {
 }
 
 bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
                                       const ui::KeyEvent& event) {
   delete_at_end_pressed_ = false;
 
   if (event.key_code() == ui::VKEY_BACK) {
     // No extra handling is needed in keyword search mode, if there is a
@@ skipping 135 matching lines @@
     menu_contents->InsertItemWithStringIdAt(
         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
   }
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }