Omnibox refactor, introduced OmniboxController.

chrome/browser/ui/omnibox/omnibox_controller.h

Index: chrome/browser/ui/omnibox/omnibox_controller.h
diff --git a/chrome/browser/ui/omnibox/omnibox_controller.h b/chrome/browser/ui/omnibox/omnibox_controller.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc718e27905991b48db92ce81e85f55c92316b54
--- /dev/null
+++ b/chrome/browser/ui/omnibox/omnibox_controller.h
@@ -0,0 +1,48 @@
+// Copyright 2013 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.
+
+#ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
+#define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
+
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
+
+class AutocompleteController;
+class OmniboxEditModel;
+class Profile;
+
+// This class controls the various services that can modify the content
+// of the omnibox, including AutocompleteController and InstantController. It is
+// responsible of updating the omnibox content.

[Peter Kasting, 2013/04/25 20:52:09]

Nit: of -> for

[beaudoin, 2013/04/25 21:09:46]

Done.

+// TODO(beaudoin): Keep on expanding this class so that OmniboxEditModel no
+//     longer needs to hold any reference to AutocompleteController. Also make
+//     this the point of contact between InstantController and OmniboxEditModel.
+//     As the refactor progresses, keep the class comment up-to-date to
+//     precisely explain what this class is doing.
+class OmniboxController : public AutocompleteControllerDelegate {
+
+ public:
+  OmniboxController(OmniboxEditModel* omnibox_edit_model, Profile* profile);
+  virtual ~OmniboxController();
+
+  // AutocompleteControllerDelegate:
+  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
+
+  // TODO(beaudoin): This should be a const method returning a const pointer but
+  //     it breaks things in a couple of places. Try to fix this.
+  AutocompleteController* autocomplete_controller() {
+    return autocomplete_controller_.get();
+  }
+
+ private:
+  // Weak, it owns us.
+  OmniboxEditModel* omnibox_edit_model_;
+
+  scoped_ptr<AutocompleteController> autocomplete_controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(OmniboxController);
+};
+
+#endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_