summaryrefslogtreecommitdiffstats
path: root/components/translate
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 08:04:46 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 15:05:09 +0000
commitfe59f48c251e124f4b896e589cb635979bb2f1fb (patch)
tree7b07cb56427dfe63f2775683555da84a557aeb90 /components/translate
parent4749549c06525071692f777fc6a1fa5a9ad7f877 (diff)
downloadchromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.zip
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.gz
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.bz2
replace OVERRIDE and FINAL with override and final in components/
BUG=417463 Review URL: https://codereview.chromium.org/623133002 Cr-Commit-Position: refs/heads/master@{#298237}
Diffstat (limited to 'components/translate')
-rw-r--r--components/translate/content/browser/content_translate_driver.h30
-rw-r--r--components/translate/content/browser/data_file_browser_cld_data_provider.h6
-rw-r--r--components/translate/content/browser/static_browser_cld_data_provider.h6
-rw-r--r--components/translate/content/renderer/data_file_renderer_cld_data_provider.h8
-rw-r--r--components/translate/content/renderer/static_renderer_cld_data_provider.h8
-rw-r--r--components/translate/content/renderer/translate_helper.h2
-rw-r--r--components/translate/core/browser/language_state_unittest.cc24
-rw-r--r--components/translate/core/browser/options_menu_model.h8
-rw-r--r--components/translate/core/browser/translate_infobar_delegate.h10
-rw-r--r--components/translate/core/browser/translate_url_fetcher.h2
10 files changed, 52 insertions, 52 deletions
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index ea77e42..3bed413 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -71,29 +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 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;
+ 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;
// content::WebContentsObserver implementation.
virtual void NavigationEntryCommitted(
- const content::LoadCommittedDetails& load_details) OVERRIDE;
+ const content::LoadCommittedDetails& load_details) override;
virtual void DidNavigateAnyFrame(
const content::LoadCommittedDetails& details,
- const content::FrameNavigateParams& params) OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ const content::FrameNavigateParams& params) override;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
// IPC handlers.
void OnTranslateAssignedSequenceNumber(int page_seq_no);
diff --git a/components/translate/content/browser/data_file_browser_cld_data_provider.h b/components/translate/content/browser/data_file_browser_cld_data_provider.h
index 2bfca1d..7b4f17e 100644
--- a/components/translate/content/browser/data_file_browser_cld_data_provider.h
+++ b/components/translate/content/browser/data_file_browser_cld_data_provider.h
@@ -19,9 +19,9 @@ class DataFileBrowserCldDataProvider : public BrowserCldDataProvider {
explicit DataFileBrowserCldDataProvider(content::WebContents*);
virtual ~DataFileBrowserCldDataProvider();
// BrowserCldDataProvider implementations:
- virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
- virtual void OnCldDataRequest() OVERRIDE;
- virtual void SendCldDataResponse() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
+ virtual void OnCldDataRequest() override;
+ virtual void SendCldDataResponse() override;
private:
void SendCldDataResponseInternal(const base::File*,
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 fe2ab0e..eb883308 100644
--- a/components/translate/content/browser/static_browser_cld_data_provider.h
+++ b/components/translate/content/browser/static_browser_cld_data_provider.h
@@ -15,9 +15,9 @@ class StaticBrowserCldDataProvider : public BrowserCldDataProvider {
explicit StaticBrowserCldDataProvider();
virtual ~StaticBrowserCldDataProvider();
// BrowserCldDataProvider implementations:
- virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
- virtual void OnCldDataRequest() OVERRIDE;
- virtual void SendCldDataResponse() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
+ virtual void OnCldDataRequest() override;
+ virtual void SendCldDataResponse() override;
private:
DISALLOW_COPY_AND_ASSIGN(StaticBrowserCldDataProvider);
diff --git a/components/translate/content/renderer/data_file_renderer_cld_data_provider.h b/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
index 5c470b3..87c1551 100644
--- a/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
@@ -17,10 +17,10 @@ class DataFileRendererCldDataProvider : public RendererCldDataProvider {
explicit DataFileRendererCldDataProvider(content::RenderViewObserver*);
virtual ~DataFileRendererCldDataProvider();
// 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;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
+ virtual void SendCldDataRequest() override;
+ virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
+ virtual bool IsCldDataAvailable() override;
private:
void OnCldDataAvailable(const IPC::PlatformFileForTransit ipc_file_handle,
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 fcd212b..77b8c5a 100644
--- a/components/translate/content/renderer/static_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/static_renderer_cld_data_provider.h
@@ -20,10 +20,10 @@ class StaticRendererCldDataProvider : public RendererCldDataProvider {
explicit StaticRendererCldDataProvider();
virtual ~StaticRendererCldDataProvider();
// 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;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
+ virtual void SendCldDataRequest() override;
+ virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
+ virtual 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 cde0efb..6e12c69 100644
--- a/components/translate/content/renderer/translate_helper.h
+++ b/components/translate/content/renderer/translate_helper.h
@@ -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;
+ virtual 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 ae7be32..3137369 100644
--- a/components/translate/core/browser/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -31,42 +31,42 @@ class MockTranslateDriver : public TranslateDriver {
virtual ~MockTranslateDriver() {}
- virtual void OnIsPageTranslatedChanged() OVERRIDE {
+ virtual void OnIsPageTranslatedChanged() override {
on_is_page_translated_changed_called_ = true;
}
- virtual void OnTranslateEnabledChanged() OVERRIDE {
+ virtual void OnTranslateEnabledChanged() override {
on_translate_enabled_changed_called_ = true;
}
- virtual bool IsLinkNavigation() OVERRIDE {
+ virtual 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 {}
+ const std::string& target_lang) override {}
- virtual void RevertTranslation(int page_seq_no) OVERRIDE {}
+ virtual void RevertTranslation(int page_seq_no) override {}
- virtual bool IsOffTheRecord() OVERRIDE { return false; }
+ virtual bool IsOffTheRecord() override { return false; }
- virtual const std::string& GetContentsMimeType() OVERRIDE {
+ virtual const std::string& GetContentsMimeType() override {
return kHtmlMimeType;
}
- virtual const GURL& GetLastCommittedURL() OVERRIDE {
+ virtual const GURL& GetLastCommittedURL() override {
return GURL::EmptyGURL();
}
- virtual const GURL& GetActiveURL() OVERRIDE { return GURL::EmptyGURL(); }
+ virtual const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
- virtual const GURL& GetVisibleURL() OVERRIDE { return GURL::EmptyGURL(); }
+ virtual const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
- virtual bool HasCurrentPage() OVERRIDE { return true; }
+ virtual bool HasCurrentPage() override { return true; }
- virtual void OpenUrlInNewTab(const GURL& url) OVERRIDE {}
+ virtual 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 d5da23e..e502c11f 100644
--- a/components/translate/core/browser/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -29,12 +29,12 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
virtual ~OptionsMenuModel();
// ui::SimpleMenuModel::Delegate implementation:
- virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
- virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+ 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;
+ ui::Accelerator* accelerator) override;
+ virtual 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 ab1bcc9..28365cb 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -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;
+ 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;
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 210983f..1f76bc8 100644
--- a/components/translate/core/browser/translate_url_fetcher.h
+++ b/components/translate/core/browser/translate_url_fetcher.h
@@ -54,7 +54,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
State state() { return state_; }
// net::URLFetcherDelegate implementation:
- virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
private:
// URL to send the request.