chrome/browser/ui/toolbar/test_toolbar_model.h - Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/test_toolbar_model.h

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

« chrome/browser/ui/android/tab_model/tab_model.h ('K') | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/test_toolbar_model.h

diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.h b/chrome/browser/ui/toolbar/test_toolbar_model.h

index 090a6f562a44478ad5cdd8a292b0dc52b53584c8..56a8e9549525fd58bdfe610d05bc71bdeb206080 100644

--- a/chrome/browser/ui/toolbar/test_toolbar_model.h

+++ b/chrome/browser/ui/toolbar/test_toolbar_model.h

@@ -15,18 +15,17 @@

class TestToolbarModel : public ToolbarModel {

public:

TestToolbarModel();

- virtual ~TestToolbarModel();

- virtual base::string16 GetText() const override;

- virtual base::string16 GetFormattedURL(size_t* prefix_end) const override;

- virtual base::string16 GetCorpusNameForMobile() const override;

- virtual GURL GetURL() const override;

- virtual bool WouldPerformSearchTermReplacement(

- bool ignore_editing) const override;

- virtual SecurityLevel GetSecurityLevel(bool ignore_editing) const override;

- virtual int GetIcon() const override;

- virtual int GetIconForSecurityLevel(SecurityLevel level) const override;

- virtual base::string16 GetEVCertName() const override;

- virtual bool ShouldDisplayURL() const override;

+ ~TestToolbarModel() override;

+ base::string16 GetText() const override;

+ base::string16 GetFormattedURL(size_t* prefix_end) const override;

+ base::string16 GetCorpusNameForMobile() const override;

+ GURL GetURL() const override;

+ bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;

+ SecurityLevel GetSecurityLevel(bool ignore_editing) const override;

+ int GetIcon() const override;

+ int GetIconForSecurityLevel(SecurityLevel level) const override;

+ base::string16 GetEVCertName() const override;

+ bool ShouldDisplayURL() const override;

void set_text(const base::string16& text) { text_ = text; }

void set_url(const GURL& url) { url_ = url;}

@@ -49,7 +48,7 @@ class TestToolbarModel : public ToolbarModel {

}

private:

- virtual bool WouldOmitURLDueToOriginChip() const override;

+ bool WouldOmitURLDueToOriginChip() const override;

base::string16 text_;

GURL url_;