| 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 fb7865881e2ef0b80005ec3cf96f63289d52eb76..d10e7e1476fcd9f34d3cc6c8e25f4f030761c448 100644
|
| --- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| +++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
|
| @@ -24,69 +24,69 @@ class TestingOmniboxView : public OmniboxView {
|
| : OmniboxView(NULL, controller, NULL) {}
|
|
|
| // OmniboxView:
|
| - virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
|
| - virtual void OnTabChanged(const WebContents* web_contents) OVERRIDE {}
|
| - virtual void Update() OVERRIDE {}
|
| - virtual void UpdatePlaceholderText() OVERRIDE {}
|
| + virtual void SaveStateToTab(WebContents* tab) override {}
|
| + virtual void OnTabChanged(const WebContents* web_contents) override {}
|
| + virtual void Update() override {}
|
| + virtual void UpdatePlaceholderText() override {}
|
| virtual void OpenMatch(const AutocompleteMatch& match,
|
| WindowOpenDisposition disposition,
|
| const GURL& alternate_nav_url,
|
| const base::string16& pasted_text,
|
| - size_t selected_line) OVERRIDE {}
|
| - virtual base::string16 GetText() const OVERRIDE { return text_; }
|
| + size_t selected_line) override {}
|
| + virtual base::string16 GetText() const override { return text_; }
|
| virtual void SetUserText(const base::string16& text,
|
| const base::string16& display_text,
|
| - bool update_popup) OVERRIDE {
|
| + bool update_popup) override {
|
| text_ = display_text;
|
| }
|
| virtual void SetWindowTextAndCaretPos(const base::string16& text,
|
| size_t caret_pos,
|
| bool update_popup,
|
| - bool notify_text_changed) OVERRIDE {
|
| + bool notify_text_changed) override {
|
| text_ = text;
|
| }
|
| - virtual void SetForcedQuery() OVERRIDE {}
|
| - virtual bool IsSelectAll() const OVERRIDE { return false; }
|
| - virtual bool DeleteAtEndPressed() OVERRIDE { return false; }
|
| - virtual void GetSelectionBounds(size_t* start, size_t* end) const OVERRIDE {}
|
| - virtual void SelectAll(bool reversed) OVERRIDE {}
|
| - virtual void RevertAll() OVERRIDE {}
|
| - virtual void UpdatePopup() OVERRIDE {}
|
| - virtual void SetFocus() OVERRIDE {}
|
| - virtual void ApplyCaretVisibility() OVERRIDE {}
|
| + virtual void SetForcedQuery() override {}
|
| + virtual bool IsSelectAll() const override { return false; }
|
| + virtual bool DeleteAtEndPressed() override { return false; }
|
| + virtual void GetSelectionBounds(size_t* start, size_t* end) const override {}
|
| + virtual void SelectAll(bool reversed) override {}
|
| + virtual void RevertAll() override {}
|
| + virtual void UpdatePopup() override {}
|
| + virtual void SetFocus() override {}
|
| + virtual void ApplyCaretVisibility() override {}
|
| virtual void OnTemporaryTextMaybeChanged(
|
| const base::string16& display_text,
|
| bool save_original_selection,
|
| - bool notify_text_changed) OVERRIDE {
|
| + bool notify_text_changed) override {
|
| text_ = display_text;
|
| }
|
| virtual bool OnInlineAutocompleteTextMaybeChanged(
|
| - const base::string16& display_text, size_t user_text_length) OVERRIDE {
|
| + const base::string16& display_text, size_t user_text_length) override {
|
| const bool text_changed = text_ != display_text;
|
| text_ = display_text;
|
| inline_autocomplete_text_ = display_text.substr(user_text_length);
|
| return text_changed;
|
| }
|
| - virtual void OnInlineAutocompleteTextCleared() OVERRIDE {
|
| + virtual void OnInlineAutocompleteTextCleared() override {
|
| inline_autocomplete_text_.clear();
|
| }
|
| - virtual void OnRevertTemporaryText() OVERRIDE {}
|
| - virtual void OnBeforePossibleChange() OVERRIDE {}
|
| - virtual bool OnAfterPossibleChange() OVERRIDE { return false; }
|
| - virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; }
|
| - virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE {
|
| + virtual void OnRevertTemporaryText() override {}
|
| + virtual void OnBeforePossibleChange() override {}
|
| + virtual bool OnAfterPossibleChange() override { return false; }
|
| + virtual gfx::NativeView GetNativeView() const override { return NULL; }
|
| + virtual gfx::NativeView GetRelativeWindowForPopup() const override {
|
| return NULL;
|
| }
|
| virtual void SetGrayTextAutocompletion(
|
| - const base::string16& input) OVERRIDE {}
|
| - virtual base::string16 GetGrayTextAutocompletion() const OVERRIDE {
|
| + const base::string16& input) override {}
|
| + virtual base::string16 GetGrayTextAutocompletion() const override {
|
| return base::string16();
|
| }
|
| - virtual int GetTextWidth() const OVERRIDE { return 0; }
|
| - virtual int GetWidth() const OVERRIDE { return 0; }
|
| - virtual bool IsImeComposing() const OVERRIDE { return false; }
|
| - virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
|
| - virtual void EmphasizeURLComponents() OVERRIDE { }
|
| + virtual int GetTextWidth() const override { return 0; }
|
| + virtual int GetWidth() const override { return 0; }
|
| + virtual bool IsImeComposing() const override { return false; }
|
| + virtual int GetOmniboxTextLength() const override { return 0; }
|
| + virtual void EmphasizeURLComponents() override { }
|
|
|
| const base::string16& inline_autocomplete_text() const {
|
| return inline_autocomplete_text_;
|
| @@ -108,16 +108,16 @@ class TestingOmniboxEditController : public OmniboxEditController {
|
|
|
| protected:
|
| // OmniboxEditController:
|
| - virtual void Update(const content::WebContents* contents) OVERRIDE {}
|
| - virtual void OnChanged() OVERRIDE {}
|
| - virtual void OnSetFocus() OVERRIDE {}
|
| - virtual void ShowURL() OVERRIDE {}
|
| - virtual void HideURL() OVERRIDE {}
|
| - virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE {}
|
| - virtual InstantController* GetInstant() OVERRIDE { return NULL; }
|
| - virtual WebContents* GetWebContents() OVERRIDE { return NULL; }
|
| - virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; }
|
| - virtual const ToolbarModel* GetToolbarModel() const OVERRIDE {
|
| + virtual void Update(const content::WebContents* contents) override {}
|
| + virtual void OnChanged() override {}
|
| + virtual void OnSetFocus() override {}
|
| + virtual void ShowURL() override {}
|
| + virtual void HideURL() override {}
|
| + virtual void EndOriginChipAnimations(bool cancel_fade) override {}
|
| + virtual InstantController* GetInstant() override { return NULL; }
|
| + virtual WebContents* GetWebContents() override { return NULL; }
|
| + virtual ToolbarModel* GetToolbarModel() override { return toolbar_model_; }
|
| + virtual const ToolbarModel* GetToolbarModel() const override {
|
| return toolbar_model_;
|
| }
|
|
|
|
|