summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 22:01:25 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 22:01:25 +0000
commitb4c49e5e17495443bb8feba522b6be7b810ca277 (patch)
treeb88a4599a0ba50e17886012dac61edca30e7e7ff
parent5d1491d00579750acfc8e3939b26cc8a598e2125 (diff)
downloadchromium_src-b4c49e5e17495443bb8feba522b6be7b810ca277.zip
chromium_src-b4c49e5e17495443bb8feba522b6be7b810ca277.tar.gz
chromium_src-b4c49e5e17495443bb8feba522b6be7b810ca277.tar.bz2
Revert 133469 - Method should not be OVERRIDE. Fix Clang.
BUG=none TEST=none TBR=sky Review URL: https://chromiumcodereview.appspot.com/10183007 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10199003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133528 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/keyboard_overlay_dialog_view.cc1
-rw-r--r--chrome/browser/ui/views/keyboard_overlay_dialog_view.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
index b1f9103..6d78a9f 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
@@ -39,7 +39,6 @@ KeyboardOverlayDialogView::KeyboardOverlayDialogView(
BrowserView* parent_view)
: HtmlDialogView(profile, parent_view->browser(), delegate),
parent_view_(parent_view) {
- RegisterDialogAccelerators();
}
KeyboardOverlayDialogView::~KeyboardOverlayDialogView() {
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
index 9ee937f..2b88117 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
@@ -34,7 +34,7 @@ class KeyboardOverlayDialogView : public HtmlDialogView {
static void ShowDialog(gfx::NativeWindow owning_window, BrowserView* parent);
private:
- void RegisterDialogAccelerators();
+ virtual void RegisterDialogAccelerators() OVERRIDE;
// Returns true if |accelerator| is an accelerator for closing the dialog.
bool IsCloseAccelerator(const ui::Accelerator& accelerator);