Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(863)

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bca3625fa0e82dd65c3537872fac03ed2f9297aa..dc71213ae09a893b8d3c729bf265b21d7d2dae58 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
@@ -24,69 +24,65 @@ 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 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_; }
- virtual void SetUserText(const base::string16& text,
- const base::string16& display_text,
- bool update_popup) override {
+ void SaveStateToTab(WebContents* tab) override {}
+ void OnTabChanged(const WebContents* web_contents) override {}
+ void Update() override {}
+ void UpdatePlaceholderText() override {}
+ void OpenMatch(const AutocompleteMatch& match,
+ WindowOpenDisposition disposition,
+ const GURL& alternate_nav_url,
+ const base::string16& pasted_text,
+ size_t selected_line) override {}
+ base::string16 GetText() const override { return text_; }
+ void SetUserText(const base::string16& text,
+ const base::string16& display_text,
+ 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 {
+ void SetWindowTextAndCaretPos(const base::string16& text,
+ size_t caret_pos,
+ bool update_popup,
+ 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 OnTemporaryTextMaybeChanged(
- const base::string16& display_text,
- bool save_original_selection,
- bool notify_text_changed) override {
+ void SetForcedQuery() override {}
+ bool IsSelectAll() const override { return false; }
+ bool DeleteAtEndPressed() override { return false; }
+ void GetSelectionBounds(size_t* start, size_t* end) const override {}
+ void SelectAll(bool reversed) override {}
+ void RevertAll() override {}
+ void UpdatePopup() override {}
+ void SetFocus() override {}
+ void ApplyCaretVisibility() override {}
+ void OnTemporaryTextMaybeChanged(const base::string16& display_text,
+ bool save_original_selection,
+ bool notify_text_changed) override {
text_ = display_text;
}
- virtual bool OnInlineAutocompleteTextMaybeChanged(
- const base::string16& display_text, size_t user_text_length) override {
+ bool OnInlineAutocompleteTextMaybeChanged(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 {
+ 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 {
- return NULL;
- }
- virtual void SetGrayTextAutocompletion(
- const base::string16& input) override {}
- virtual base::string16 GetGrayTextAutocompletion() const override {
+ void OnRevertTemporaryText() override {}
+ void OnBeforePossibleChange() override {}
+ bool OnAfterPossibleChange() override { return false; }
+ gfx::NativeView GetNativeView() const override { return NULL; }
+ gfx::NativeView GetRelativeWindowForPopup() const override { return NULL; }
+ void SetGrayTextAutocompletion(const base::string16& input) override {}
+ 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 { }
+ int GetTextWidth() const override { return 0; }
+ int GetWidth() const override { return 0; }
+ bool IsImeComposing() const override { return false; }
+ int GetOmniboxTextLength() const override { return 0; }
+ void EmphasizeURLComponents() override {}
const base::string16& inline_autocomplete_text() const {
return inline_autocomplete_text_;
@@ -108,16 +104,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 {
+ void Update(const content::WebContents* contents) override {}
+ void OnChanged() override {}
+ void OnSetFocus() override {}
+ void ShowURL() override {}
+ void HideURL() override {}
+ void EndOriginChipAnimations(bool cancel_fade) override {}
+ InstantController* GetInstant() override { return NULL; }
+ WebContents* GetWebContents() override { return NULL; }
+ ToolbarModel* GetToolbarModel() override { return toolbar_model_; }
+ const ToolbarModel* GetToolbarModel() const override {
return toolbar_model_;
}

Powered by Google App Engine
This is Rietveld 408576698