summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/jsmessage_box_dialog.cc
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 00:38:27 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 00:38:27 +0000
commit7f05552488f8f9ea5000512fd1972894aee7ee82 (patch)
tree0e2ed5a562335907e44307a1d99e9c6ab8d8a3ec /chrome/browser/views/jsmessage_box_dialog.cc
parent9d7e8fd4a448491817b816585d6f375d71c0a97a (diff)
downloadchromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.zip
chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.gz
chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.bz2
Re-lands 58186:
Original message: """ Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 """ TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/jsmessage_box_dialog.cc')
-rw-r--r--chrome/browser/views/jsmessage_box_dialog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc
index 5d8049a..f51116b 100644
--- a/chrome/browser/views/jsmessage_box_dialog.cc
+++ b/chrome/browser/views/jsmessage_box_dialog.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/views/jsmessage_box_dialog.h"
+#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/message_box_flags.h"
-#include "base/keyboard_codes.h"
#include "chrome/browser/app_modal_dialog.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "grit/generated_resources.h"
@@ -25,7 +25,7 @@ JavaScriptMessageBoxDialog::JavaScriptMessageBoxDialog(
DCHECK(message_box_view_);
message_box_view_->AddAccelerator(
- views::Accelerator(base::VKEY_C, false, true, false));
+ views::Accelerator(app::VKEY_C, false, true, false));
if (display_suppress_checkbox) {
message_box_view_->SetCheckBoxLabel(
l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));