| 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 f32890e7e076f19e276da498fdda29bbc377c27f..090a6f562a44478ad5cdd8a292b0dc52b53584c8 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| @@ -16,17 +16,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 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;
|
| + 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;
|
|
|
| void set_text(const base::string16& text) { text_ = text; }
|
| void set_url(const GURL& url) { url_ = url;}
|
| @@ -49,7 +49,7 @@ class TestToolbarModel : public ToolbarModel {
|
| }
|
|
|
| private:
|
| - virtual bool WouldOmitURLDueToOriginChip() const OVERRIDE;
|
| + virtual bool WouldOmitURLDueToOriginChip() const override;
|
|
|
| base::string16 text_;
|
| GURL url_;
|
|
|