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

Unified Diff: chrome/browser/ui/views/bubble/bubble.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
Index: chrome/browser/ui/views/bubble/bubble.cc
diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc
index f16c03ff204aa2c354e69066b0fc117ef359ba77..43128534b0317e102b2ed60d8974b21d6f95775b 100644
--- a/chrome/browser/ui/views/bubble/bubble.cc
+++ b/chrome/browser/ui/views/bubble/bubble.cc
@@ -324,14 +324,14 @@ void Bubble::InitBubble(views::Widget* parent,
void Bubble::RegisterEscapeAccelerator() {
GetWidget()->GetFocusManager()->RegisterAccelerator(
- views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+ ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
accelerator_registered_ = true;
}
void Bubble::UnregisterEscapeAccelerator() {
DCHECK(accelerator_registered_);
GetWidget()->GetFocusManager()->UnregisterAccelerator(
- views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+ ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
accelerator_registered_ = false;
}
@@ -443,7 +443,7 @@ void Bubble::Fade(bool fade_in) {
animation_->Hide();
}
-bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
+bool Bubble::AcceleratorPressed(const ui::Accelerator& accelerator) {
if (!delegate_ || delegate_->CloseOnEscape()) {
DoClose(true);
return true;
« no previous file with comments | « chrome/browser/ui/views/bubble/bubble.h ('k') | chrome/browser/ui/views/constrained_window_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698