| Index: chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| index a5958d1bf5de453c303a93ca523b37e04e0cfb61..fffc2cc9c4994b4a5e3368f7c0dda648eb172454 100644
|
| --- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| +++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| @@ -20,10 +20,10 @@ namespace {
|
|
|
| class TestingOmniboxView : public OmniboxView {
|
| public:
|
| - TestingOmniboxView() {}
|
| + TestingOmniboxView() : OmniboxView(NULL, NULL, NULL, NULL) {}
|
|
|
| - virtual OmniboxEditModel* model() OVERRIDE { return NULL; }
|
| - virtual const OmniboxEditModel* model() const OVERRIDE { return NULL; }
|
| + virtual OmniboxEditModel* GetModel() OVERRIDE { return NULL; }
|
| + virtual const OmniboxEditModel* GetModel() const OVERRIDE { return NULL; }
|
| virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
|
| virtual void Update(const WebContents* tab_for_state_restoring) OVERRIDE {}
|
| virtual void OpenMatch(const AutocompleteMatch& match,
|
| @@ -33,7 +33,6 @@ class TestingOmniboxView : public OmniboxView {
|
| virtual string16 GetText() const OVERRIDE { return string16(); }
|
| virtual bool IsEditingOrEmpty() const OVERRIDE { return true; }
|
| virtual int GetIcon() const OVERRIDE { return 0; }
|
| - virtual void SetUserText(const string16& text) OVERRIDE {}
|
| virtual void SetUserText(const string16& text,
|
| const string16& display_text,
|
| bool update_popup) OVERRIDE {}
|
| @@ -65,6 +64,9 @@ class TestingOmniboxView : public OmniboxView {
|
| return NULL;
|
| }
|
| virtual CommandUpdater* GetCommandUpdater() OVERRIDE { return NULL; }
|
| + virtual const CommandUpdater* GetCommandUpdater() const OVERRIDE {
|
| + return NULL;
|
| + }
|
| virtual void SetInstantSuggestion(const string16& input,
|
| bool animate_to_complete) OVERRIDE {}
|
| virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); }
|
| @@ -83,6 +85,9 @@ class TestingOmniboxView : public OmniboxView {
|
| virtual int WidthOfTextAfterCursor() { return 0; }
|
| #endif
|
|
|
| + virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
|
| + virtual void EmphasizeURLComponents() OVERRIDE { }
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(TestingOmniboxView);
|
| };
|
|
|