summaryrefslogtreecommitdiffstats
path: root/components/web_contents_delegate_android
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/web_contents_delegate_android
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/web_contents_delegate_android')
-rw-r--r--components/web_contents_delegate_android/color_chooser_android.h4
-rw-r--r--components/web_contents_delegate_android/web_contents_delegate_android.h44
2 files changed, 24 insertions, 24 deletions
diff --git a/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
index eefd85b..3966d1b 100644
--- a/components/web_contents_delegate_android/color_chooser_android.h
+++ b/components/web_contents_delegate_android/color_chooser_android.h
@@ -33,8 +33,8 @@ class ColorChooserAndroid : public content::ColorChooser {
void OnColorChosen(JNIEnv* env, jobject obj, jint color);
// ColorChooser interface
- virtual void End() OVERRIDE;
- virtual void SetSelectedColor(SkColor color) OVERRIDE;
+ virtual void End() override;
+ virtual void SetSelectedColor(SkColor color) override;
private:
base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
index 3a0f8ac..e64f07a 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -53,53 +53,53 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
// Overridden from WebContentsDelegate:
virtual content::WebContents* OpenURLFromTab(
content::WebContents* source,
- const content::OpenURLParams& params) OVERRIDE;
+ const content::OpenURLParams& params) override;
virtual content::ColorChooser* OpenColorChooser(
content::WebContents* source,
SkColor color,
- const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE;
+ const std::vector<content::ColorSuggestion>& suggestions) override;
virtual void NavigationStateChanged(
const content::WebContents* source,
- content::InvalidateTypes changed_flags) OVERRIDE;
+ content::InvalidateTypes changed_flags) override;
virtual void VisibleSSLStateChanged(
- const content::WebContents* source) OVERRIDE;
- virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
- virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
+ const content::WebContents* source) override;
+ virtual void ActivateContents(content::WebContents* contents) override;
+ virtual void DeactivateContents(content::WebContents* contents) override;
virtual void LoadingStateChanged(content::WebContents* source,
- bool to_different_document) OVERRIDE;
+ bool to_different_document) override;
virtual void LoadProgressChanged(content::WebContents* source,
- double load_progress) OVERRIDE;
- virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
- virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
- virtual void CloseContents(content::WebContents* source) OVERRIDE;
+ double load_progress) override;
+ virtual void RendererUnresponsive(content::WebContents* source) override;
+ virtual void RendererResponsive(content::WebContents* source) override;
+ virtual void CloseContents(content::WebContents* source) override;
virtual void MoveContents(content::WebContents* source,
- const gfx::Rect& pos) OVERRIDE;
+ const gfx::Rect& pos) override;
virtual bool AddMessageToConsole(content::WebContents* source,
int32 level,
const base::string16& message,
int32 line_no,
- const base::string16& source_id) OVERRIDE;
+ const base::string16& source_id) override;
virtual void UpdateTargetURL(content::WebContents* source,
- const GURL& url) OVERRIDE;
+ const GURL& url) override;
virtual void HandleKeyboardEvent(
content::WebContents* source,
- const content::NativeWebKeyboardEvent& event) OVERRIDE;
- virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
+ const content::NativeWebKeyboardEvent& event) override;
+ virtual bool TakeFocus(content::WebContents* source, bool reverse) override;
virtual void ShowRepostFormWarningDialog(
- content::WebContents* source) OVERRIDE;
+ content::WebContents* source) override;
virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
- bool enter_fullscreen) OVERRIDE;
+ bool enter_fullscreen) override;
virtual bool IsFullscreenForTabOrPending(
- const content::WebContents* web_contents) const OVERRIDE;
+ const content::WebContents* web_contents) const override;
virtual void ShowValidationMessage(content::WebContents* web_contents,
const gfx::Rect& anchor_in_root_view,
const base::string16& main_text,
- const base::string16& sub_text) OVERRIDE;
+ const base::string16& sub_text) override;
virtual void HideValidationMessage(
- content::WebContents* web_contents) OVERRIDE;
+ content::WebContents* web_contents) override;
virtual void MoveValidationMessage(
content::WebContents* web_contents,
- const gfx::Rect& anchor_in_root_view) OVERRIDE;
+ const gfx::Rect& anchor_in_root_view) override;
protected:
base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;