Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: chrome/browser/views/fullscreen_exit_bubble.cc

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/html_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/fullscreen_exit_bubble.cc
===================================================================
--- chrome/browser/views/fullscreen_exit_bubble.cc (revision 58389)
+++ chrome/browser/views/fullscreen_exit_bubble.cc (working copy)
@@ -4,9 +4,9 @@
#include "chrome/browser/views/fullscreen_exit_bubble.h"
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "base/keyboard_codes.h"
#include "chrome/app/chrome_dll_resource.h"
#include "gfx/canvas_skia.h"
#include "grit/generated_resources.h"
@@ -142,7 +142,7 @@
size_animation_->Reset(1);
// Create the contents view.
- views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
+ views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false);
bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);
DCHECK(got_accelerator);
view_ = new FullscreenExitView(this, accelerator.GetShortcutText());
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/html_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698