summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoralicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 02:40:20 +0000
committeralicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 02:40:20 +0000
commit404aa1f8a14df44dd03e637693dd09a66cbb8f4c (patch)
tree92c42b8ca7424f153950cdc9be78e5a7be76d204 /chrome/browser
parentc6b2b7f8ef35803b8a638841758b5e0967e993b3 (diff)
downloadchromium_src-404aa1f8a14df44dd03e637693dd09a66cbb8f4c.zip
chromium_src-404aa1f8a14df44dd03e637693dd09a66cbb8f4c.tar.gz
chromium_src-404aa1f8a14df44dd03e637693dd09a66cbb8f4c.tar.bz2
fix style violation for clang style plugin on chromeos.
BUG= TEST= Review URL: http://codereview.chromium.org/8761010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/views/crypto_module_password_dialog_view.cc8
-rw-r--r--chrome/browser/ui/views/crypto_module_password_dialog_view.h20
2 files changed, 18 insertions, 10 deletions
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
index d04831d..92bd120 100644
--- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
@@ -30,6 +30,9 @@ CryptoModulePasswordDialogView::CryptoModulePasswordDialogView(
Init(server, slot_name, reason);
}
+CryptoModulePasswordDialogView::~CryptoModulePasswordDialogView() {
+}
+
void CryptoModulePasswordDialogView::Init(
const std::string& server,
const std::string& slot_name,
@@ -142,6 +145,11 @@ bool CryptoModulePasswordDialogView::HandleKeyEvent(
return false;
}
+void CryptoModulePasswordDialogView::ContentsChanged(
+ views::Textfield* sender,
+ const string16& new_contents) {
+}
+
string16 CryptoModulePasswordDialogView::GetWindowTitle() const {
return UTF8ToUTF16(l10n_util::GetStringUTF8(
IDS_CRYPTO_MODULE_AUTH_DIALOG_TITLE));
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.h b/chrome/browser/ui/views/crypto_module_password_dialog_view.h
index ec8c83a..3b8bfe6 100644
--- a/chrome/browser/ui/views/crypto_module_password_dialog_view.h
+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.h
@@ -34,28 +34,28 @@ class CryptoModulePasswordDialogView : public views::DialogDelegateView,
const std::string& server,
const base::Callback<void(const char*)>& callback);
- virtual ~CryptoModulePasswordDialogView() {}
+ virtual ~CryptoModulePasswordDialogView();
// views::DialogDelegate:
- virtual bool Accept();
- virtual bool Cancel();
+ virtual bool Accept() OVERRIDE;
+ virtual bool Cancel() OVERRIDE;
string16 GetDialogButtonLabel(
- ui::DialogButton button) const;
+ ui::DialogButton button) const OVERRIDE;
// views::WidgetDelegate:
- virtual views::View* GetInitiallyFocusedView();
- virtual bool IsModal() const;
- virtual views::View* GetContentsView();
+ virtual views::View* GetInitiallyFocusedView() OVERRIDE;
+ virtual bool IsModal() const OVERRIDE;
+ virtual views::View* GetContentsView() OVERRIDE;
// views::View:
- virtual string16 GetWindowTitle() const;
+ virtual string16 GetWindowTitle() const OVERRIDE;
// views::TextfieldController:
virtual bool HandleKeyEvent(views::Textfield* sender,
- const views::KeyEvent& keystroke);
+ const views::KeyEvent& keystroke) OVERRIDE;
virtual void ContentsChanged(views::Textfield* sender,
- const string16& new_contents) {}
+ const string16& new_contents) OVERRIDE;
private:
// Initialize views and layout.