Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/omnibox/omnibox_view.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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "ui/base/clipboard/clipboard.h"
 
+// static
 string16 OmniboxView::StripJavascriptSchemas(const string16& text) {
   const string16 kJsPrefix(ASCIIToUTF16(chrome::kJavaScriptScheme) +
                            ASCIIToUTF16(":"));
   string16 out(text);
   while (StartsWith(out, kJsPrefix, false))
     TrimWhitespace(out.substr(kJsPrefix.length()), TRIM_LEADING, &out);
   return out;
 }
 
 // static
@@ skipping 33 matching lines @@
     std::string url_str;
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid())
       return StripJavascriptSchemas(UTF8ToUTF16(url.spec()));
   }
 
   return string16();
 }
+
+OmniboxView::~OmniboxView() {
+}
+
+void OmniboxView::OpenMatch(const AutocompleteMatch& match,
+                            WindowOpenDisposition disposition,
+                            const GURL& alternate_nav_url,
+                            size_t selected_line) {
+  // Invalid URLs such as chrome://history can end up here.

[Peter Kasting, 2012/08/07 02:47:05]

Oh?  I thought this didn't happen?  Did you find a repro case?

[dominich, 2012/08/07 17:48:20]

Yes - typing chrome://history :)

+  if (!match.destination_url.is_valid())
+    return;
+  // |model_| can be NULL in tests.

[Peter Kasting, 2012/08/07 02:47:05]

Nit: Instead of putting these comments in every function, put one comment on the
class members' declaration.

[dominich, 2012/08/07 17:48:20]

Done.

+  if (model_.get())
+    model_->OpenMatch(match, disposition, alternate_nav_url, selected_line);
+}
+
+bool OmniboxView::IsEditingOrEmpty() const {
+  // |model_| can be NULL in tests.
+  return (model_.get() && model_->user_input_in_progress()) ||
+      (GetOmniboxTextLength() == 0);
+}
+
+int OmniboxView::GetIcon() const {
+  // |model_| can be NULL in tests.
+  return IsEditingOrEmpty() ?

[Peter Kasting, 2012/08/07 02:47:05]

Nit: Don't nest ?:s

[dominich, 2012/08/07 17:48:20]

Done.

+      AutocompleteMatch::TypeToIcon(model_.get() ?
+          model_->CurrentTextType() : AutocompleteMatch::URL_WHAT_YOU_TYPED) :
+      toolbar_model_->GetIcon();
+}
+
+void OmniboxView::SetUserText(const string16& text) {
+  SetUserText(text, text, true);
+}
+
+void OmniboxView::SetUserText(const string16& text,
+                              const string16& display_text,
+                              bool update_popup) {
+  // |model_| can be NULL in tests.
+  if (model_.get())
+    model_->SetUserText(text);
+  // TODO(deanm): something about selection / focus change here.

[Peter Kasting, 2012/08/07 02:47:05]

Nit: I thought you were going to kill this comment?

[dominich, 2012/08/07 17:48:20]

Done.

+  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
+                           true);
+}
+
+void OmniboxView::RevertAll() {
+  CloseAutocompletePopup();
+  // |model_| can be NULL in tests.
+  if (model_.get())
+    model_->Revert();
+  TextChanged();
+}
+
+void OmniboxView::CloseAutocompletePopup() {
+  // |model_| can be NULL in tests.
+  if (model_.get())
+    model_->StopAutocomplete();
+}
+
+OmniboxView::OmniboxView(Profile* profile,
+                         OmniboxEditController* controller,
+                         ToolbarModel* toolbar_model,
+                         CommandUpdater* command_updater)
+    : controller_(controller),
+      toolbar_model_(toolbar_model),
+      command_updater_(command_updater) {
+  // |profile| can be NULL in tests.
+  if (profile)
+    model_.reset(new OmniboxEditModel(this, controller, profile));
+}
+
+void OmniboxView::TextChanged() {
+  EmphasizeURLComponents();
+  // |model_| can be NULL in tests.
+  if (model_.get())
+    model_->OnChanged();
+}