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/browser_process.h"
 #include "ui/base/clipboard/clipboard.h"
 
+OmniboxEditModel* OmniboxView::GetModel() {
+  return model_.get();
+}
+
+const OmniboxEditModel* OmniboxView::GetModel() const {
+  return model_.get();
+}
+
+CommandUpdater* OmniboxView::GetCommandUpdater() {
+  return command_updater_;
+}
+
+const CommandUpdater* OmniboxView::GetCommandUpdater() const {
+  return command_updater_;
+}
+
+// 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();
 }
+
+void OmniboxView::OpenMatch(const AutocompleteMatch& match,
+                            WindowOpenDisposition disposition,
+                            const GURL& alternate_nav_url,
+                            size_t selected_line) {
+  // TODO(shess): Why is the caller passing an invalid url in the
+  // first place?  Make sure that case isn't being dropped on the
+  // floor.

[Peter Kasting, 2012/07/26 03:59:17]

I think this can perhaps happen if for example you type a lone question mark and
hit enter.  See if that reaches here and if so you can probably replace Scott's
comment with a better one.

+  if (!match.destination_url.is_valid()) {

[Peter Kasting, 2012/07/26 03:59:17]

Nit: No {}

[dominich, 2012/07/26 22:33:24]

Done.

+    return;
+  }
+
+  model_->OpenMatch(match, disposition, alternate_nav_url, selected_line);
+}
+
+bool OmniboxView::IsEditingOrEmpty() const {
+  return model_->user_input_in_progress() || (GetOmniboxTextLength() == 0);
+}
+
+int OmniboxView::GetIcon() const {
+  return IsEditingOrEmpty() ?
+      AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
+      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_->SetUserText(text);
+  // TODO(deanm): something about selection / focus change here.

[Peter Kasting, 2012/07/26 03:59:17]

I don't know what this comment means, and I'm inclined to just nuke it at this
point.  Maybe erg might have a guess.

[Peter Kasting, 2012/07/26 23:03:24]

Note this is still outstanding.

[dominich, 2012/07/30 16:42:59]

I'm tempted to just nuke it. We don't have any open bugs about selection and
focus change issues. It looks like the comment was added for gtk and then
brought over to mac by shess. Win and views have no similar comment.

+  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
+                           true);
+}
+
+void OmniboxView::RevertAll() {
+  ClosePopup();
+  model_->Revert();
+  TextChanged();
+}
+
+void OmniboxView::ClosePopup() {
+  model_->StopAutocomplete();
+}
+
+OmniboxView::~OmniboxView() {
+}
+
+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_->OnChanged();
+}