OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/dropdown_bar_host.h" | 5 #include "chrome/browser/ui/views/dropdown_bar_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "chrome/browser/ui/view_ids.h" | 9 #include "chrome/browser/ui/view_ids.h" |
10 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" | 10 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" |
11 #include "chrome/browser/ui/views/dropdown_bar_view.h" | |
12 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
13 #include "chrome/browser/ui/views/theme_copying_widget.h" | 12 #include "chrome/browser/ui/views/theme_copying_widget.h" |
14 #include "ui/events/keycodes/keyboard_codes.h" | 13 #include "ui/events/keycodes/keyboard_codes.h" |
15 #include "ui/gfx/animation/slide_animation.h" | 14 #include "ui/gfx/animation/slide_animation.h" |
16 #include "ui/gfx/scrollbar_size.h" | 15 #include "ui/gfx/scrollbar_size.h" |
17 #include "ui/views/focus/external_focus_tracker.h" | 16 #include "ui/views/focus/external_focus_tracker.h" |
18 #include "ui/views/focus/view_storage.h" | 17 #include "ui/views/focus/view_storage.h" |
19 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
20 | 19 |
21 // static | 20 // static |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 escape, ui::AcceleratorManager::kNormalPriority, this); | 228 escape, ui::AcceleratorManager::kNormalPriority, this); |
230 esc_accel_target_registered_ = true; | 229 esc_accel_target_registered_ = true; |
231 } | 230 } |
232 | 231 |
233 void DropdownBarHost::UnregisterAccelerators() { | 232 void DropdownBarHost::UnregisterAccelerators() { |
234 DCHECK(esc_accel_target_registered_); | 233 DCHECK(esc_accel_target_registered_); |
235 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); | 234 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); |
236 focus_manager_->UnregisterAccelerator(escape, this); | 235 focus_manager_->UnregisterAccelerator(escape, this); |
237 esc_accel_target_registered_ = false; | 236 esc_accel_target_registered_ = false; |
238 } | 237 } |
OLD | NEW |