summaryrefslogtreecommitdiffstats
path: root/components/translate
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 04:24:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 11:25:34 +0000
commit00ea022b81af00857b352bae68d4ba2eb3e1493b (patch)
treeb5e3e536a25f154ab5410d611736832c11b2cfad /components/translate
parent0b0885ca539071e7864061fde54c7345a0fd2aae (diff)
downloadchromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.zip
chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.gz
chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.bz2
Standardize usage of virtual/override/final in components/
BUG=417463 TBR=blundell@chromium.org Review URL: https://codereview.chromium.org/666133002 Cr-Commit-Position: refs/heads/master@{#300456}
Diffstat (limited to 'components/translate')
-rw-r--r--components/translate/content/browser/browser_cld_data_provider.h2
-rw-r--r--components/translate/content/browser/content_translate_driver.h43
-rw-r--r--components/translate/content/browser/static_browser_cld_data_provider.h8
-rw-r--r--components/translate/content/renderer/renderer_cld_data_provider.h2
-rw-r--r--components/translate/content/renderer/static_renderer_cld_data_provider.h10
-rw-r--r--components/translate/content/renderer/translate_helper.h4
-rw-r--r--components/translate/core/browser/language_state_unittest.cc36
-rw-r--r--components/translate/core/browser/options_menu_model.h13
-rw-r--r--components/translate/core/browser/translate_infobar_delegate.h12
-rw-r--r--components/translate/core/browser/translate_url_fetcher.h4
10 files changed, 63 insertions, 71 deletions
diff --git a/components/translate/content/browser/browser_cld_data_provider.h b/components/translate/content/browser/browser_cld_data_provider.h
index 4e8776a..f46807e 100644
--- a/components/translate/content/browser/browser_cld_data_provider.h
+++ b/components/translate/content/browser/browser_cld_data_provider.h
@@ -31,7 +31,7 @@ namespace translate {
// constant from ipc_message_start.h
class BrowserCldDataProvider : public IPC::Listener {
public:
- virtual ~BrowserCldDataProvider() {}
+ ~BrowserCldDataProvider() override {}
// IPC::Listener implementation:
// If the specified message is a request for CLD data, invokes
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index 196ebaf..4acb00d 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -51,7 +51,7 @@ class ContentTranslateDriver : public TranslateDriver,
};
ContentTranslateDriver(content::NavigationController* nav_controller);
- virtual ~ContentTranslateDriver();
+ ~ContentTranslateDriver() override;
// Adds or Removes observers.
void AddObserver(Observer* observer);
@@ -71,30 +71,29 @@ class ContentTranslateDriver : public TranslateDriver,
void InitiateTranslation(const std::string& page_lang, int attempt);
// TranslateDriver methods.
- virtual void OnIsPageTranslatedChanged() override;
- virtual void OnTranslateEnabledChanged() override;
- virtual bool IsLinkNavigation() override;
- virtual void TranslatePage(int page_seq_no,
- const std::string& translate_script,
- const std::string& source_lang,
- const std::string& target_lang) override;
- virtual void RevertTranslation(int page_seq_no) override;
- virtual bool IsOffTheRecord() override;
- virtual const std::string& GetContentsMimeType() override;
- virtual const GURL& GetLastCommittedURL() override;
- virtual const GURL& GetActiveURL() override;
- virtual const GURL& GetVisibleURL() override;
- virtual bool HasCurrentPage() override;
- virtual void OpenUrlInNewTab(const GURL& url) override;
+ void OnIsPageTranslatedChanged() override;
+ void OnTranslateEnabledChanged() override;
+ bool IsLinkNavigation() override;
+ void TranslatePage(int page_seq_no,
+ const std::string& translate_script,
+ const std::string& source_lang,
+ const std::string& target_lang) override;
+ void RevertTranslation(int page_seq_no) override;
+ bool IsOffTheRecord() override;
+ const std::string& GetContentsMimeType() override;
+ const GURL& GetLastCommittedURL() override;
+ const GURL& GetActiveURL() override;
+ const GURL& GetVisibleURL() override;
+ bool HasCurrentPage() override;
+ void OpenUrlInNewTab(const GURL& url) override;
// content::WebContentsObserver implementation.
- virtual void NavigationEntryCommitted(
+ void NavigationEntryCommitted(
const content::LoadCommittedDetails& load_details) override;
- virtual void DidNavigateAnyFrame(
- content::RenderFrameHost* render_frame_host,
- const content::LoadCommittedDetails& details,
- const content::FrameNavigateParams& params) override;
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ void DidNavigateAnyFrame(content::RenderFrameHost* render_frame_host,
+ const content::LoadCommittedDetails& details,
+ const content::FrameNavigateParams& params) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
// IPC handlers.
void OnTranslateAssignedSequenceNumber(int page_seq_no);
diff --git a/components/translate/content/browser/static_browser_cld_data_provider.h b/components/translate/content/browser/static_browser_cld_data_provider.h
index eb883308..04a4232 100644
--- a/components/translate/content/browser/static_browser_cld_data_provider.h
+++ b/components/translate/content/browser/static_browser_cld_data_provider.h
@@ -13,11 +13,11 @@ namespace translate {
class StaticBrowserCldDataProvider : public BrowserCldDataProvider {
public:
explicit StaticBrowserCldDataProvider();
- virtual ~StaticBrowserCldDataProvider();
+ ~StaticBrowserCldDataProvider() override;
// BrowserCldDataProvider implementations:
- virtual bool OnMessageReceived(const IPC::Message&) override;
- virtual void OnCldDataRequest() override;
- virtual void SendCldDataResponse() override;
+ bool OnMessageReceived(const IPC::Message&) override;
+ void OnCldDataRequest() override;
+ void SendCldDataResponse() override;
private:
DISALLOW_COPY_AND_ASSIGN(StaticBrowserCldDataProvider);
diff --git a/components/translate/content/renderer/renderer_cld_data_provider.h b/components/translate/content/renderer/renderer_cld_data_provider.h
index 4da053a..fb0a333 100644
--- a/components/translate/content/renderer/renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/renderer_cld_data_provider.h
@@ -29,7 +29,7 @@ namespace translate {
// constant from ipc_message_start.h
class RendererCldDataProvider : public IPC::Listener {
public:
- virtual ~RendererCldDataProvider() {}
+ ~RendererCldDataProvider() override {}
// (Inherited from IPC::Listener)
// If the specified message is a response for CLD data, attempts to
diff --git a/components/translate/content/renderer/static_renderer_cld_data_provider.h b/components/translate/content/renderer/static_renderer_cld_data_provider.h
index 77b8c5a..a2f82f9 100644
--- a/components/translate/content/renderer/static_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/static_renderer_cld_data_provider.h
@@ -18,12 +18,12 @@ namespace translate {
class StaticRendererCldDataProvider : public RendererCldDataProvider {
public:
explicit StaticRendererCldDataProvider();
- virtual ~StaticRendererCldDataProvider();
+ ~StaticRendererCldDataProvider() override;
// RendererCldDataProvider implementations:
- virtual bool OnMessageReceived(const IPC::Message&) override;
- virtual void SendCldDataRequest() override;
- virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
- virtual bool IsCldDataAvailable() override;
+ bool OnMessageReceived(const IPC::Message&) override;
+ void SendCldDataRequest() override;
+ void SetCldAvailableCallback(base::Callback<void(void)>) override;
+ bool IsCldDataAvailable() override;
private:
DISALLOW_COPY_AND_ASSIGN(StaticRendererCldDataProvider);
diff --git a/components/translate/content/renderer/translate_helper.h b/components/translate/content/renderer/translate_helper.h
index 6e12c69..4d9275d 100644
--- a/components/translate/content/renderer/translate_helper.h
+++ b/components/translate/content/renderer/translate_helper.h
@@ -83,7 +83,7 @@ class TranslateHelper : public content::RenderViewObserver {
int world_id,
int extension_group,
const std::string& extension_scheme);
- virtual ~TranslateHelper();
+ ~TranslateHelper() override;
// Informs us that the page's text has been extracted.
void PageCaptured(const base::string16& contents);
@@ -180,7 +180,7 @@ class TranslateHelper : public content::RenderViewObserver {
static bool IsTranslationAllowed(blink::WebDocument* document);
// RenderViewObserver implementation.
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
// Informs us that the page's text has been extracted.
void PageCapturedImpl(int page_seq_no, const base::string16& contents);
diff --git a/components/translate/core/browser/language_state_unittest.cc b/components/translate/core/browser/language_state_unittest.cc
index 3137369..12bab06 100644
--- a/components/translate/core/browser/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -31,42 +31,36 @@ class MockTranslateDriver : public TranslateDriver {
virtual ~MockTranslateDriver() {}
- virtual void OnIsPageTranslatedChanged() override {
+ void OnIsPageTranslatedChanged() override {
on_is_page_translated_changed_called_ = true;
}
- virtual void OnTranslateEnabledChanged() override {
+ void OnTranslateEnabledChanged() override {
on_translate_enabled_changed_called_ = true;
}
- virtual bool IsLinkNavigation() override {
- return false;
- }
+ bool IsLinkNavigation() override { return false; }
- virtual void TranslatePage(int page_seq_no,
- const std::string& translate_script,
- const std::string& source_lang,
- const std::string& target_lang) override {}
+ void TranslatePage(int page_seq_no,
+ const std::string& translate_script,
+ const std::string& source_lang,
+ const std::string& target_lang) override {}
- virtual void RevertTranslation(int page_seq_no) override {}
+ void RevertTranslation(int page_seq_no) override {}
- virtual bool IsOffTheRecord() override { return false; }
+ bool IsOffTheRecord() override { return false; }
- virtual const std::string& GetContentsMimeType() override {
- return kHtmlMimeType;
- }
+ const std::string& GetContentsMimeType() override { return kHtmlMimeType; }
- virtual const GURL& GetLastCommittedURL() override {
- return GURL::EmptyGURL();
- }
+ const GURL& GetLastCommittedURL() override { return GURL::EmptyGURL(); }
- virtual const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
+ const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
- virtual const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
+ const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
- virtual bool HasCurrentPage() override { return true; }
+ bool HasCurrentPage() override { return true; }
- virtual void OpenUrlInNewTab(const GURL& url) override {}
+ void OpenUrlInNewTab(const GURL& url) override {}
bool on_is_page_translated_changed_called() const {
return on_is_page_translated_changed_called_;
diff --git a/components/translate/core/browser/options_menu_model.h b/components/translate/core/browser/options_menu_model.h
index e502c11f..5beae3b 100644
--- a/components/translate/core/browser/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -26,15 +26,14 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
};
explicit OptionsMenuModel(TranslateInfoBarDelegate* translate_delegate);
- virtual ~OptionsMenuModel();
+ ~OptionsMenuModel() override;
// ui::SimpleMenuModel::Delegate implementation:
- virtual bool IsCommandIdChecked(int command_id) const override;
- virtual bool IsCommandIdEnabled(int command_id) const override;
- virtual bool GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) override;
- virtual void ExecuteCommand(int command_id, int event_flags) override;
+ bool IsCommandIdChecked(int command_id) const override;
+ bool IsCommandIdEnabled(int command_id) const override;
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override;
+ void ExecuteCommand(int command_id, int event_flags) override;
private:
TranslateInfoBarDelegate* translate_infobar_delegate_;
diff --git a/components/translate/core/browser/translate_infobar_delegate.h b/components/translate/core/browser/translate_infobar_delegate.h
index 28365cb..f0ca769 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -40,7 +40,7 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
static const size_t kNoIndex;
- virtual ~TranslateInfoBarDelegate();
+ ~TranslateInfoBarDelegate() override;
// Factory method to create a translate infobar. |error_type| must be
// specified iff |step| == TRANSLATION_ERROR. For other translate steps,
@@ -192,11 +192,11 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
typedef std::pair<std::string, base::string16> LanguageNamePair;
// InfoBarDelegate:
- virtual void InfoBarDismissed() override;
- virtual int GetIconID() const override;
- virtual infobars::InfoBarDelegate::Type GetInfoBarType() const override;
- virtual bool ShouldExpire(const NavigationDetails& details) const override;
- virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() override;
+ void InfoBarDismissed() override;
+ int GetIconID() const override;
+ infobars::InfoBarDelegate::Type GetInfoBarType() const override;
+ bool ShouldExpire(const NavigationDetails& details) const override;
+ TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() override;
bool is_off_the_record_;
translate::TranslateStep step_;
diff --git a/components/translate/core/browser/translate_url_fetcher.h b/components/translate/core/browser/translate_url_fetcher.h
index 1f76bc8..90ed6bc 100644
--- a/components/translate/core/browser/translate_url_fetcher.h
+++ b/components/translate/core/browser/translate_url_fetcher.h
@@ -28,7 +28,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
};
explicit TranslateURLFetcher(int id);
- virtual ~TranslateURLFetcher();
+ ~TranslateURLFetcher() override;
int max_retry_on_5xx() {
return max_retry_on_5xx_;
@@ -54,7 +54,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
State state() { return state_; }
// net::URLFetcherDelegate implementation:
- virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+ void OnURLFetchComplete(const net::URLFetcher* source) override;
private:
// URL to send the request.