OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/dropdown_bar_host.h" | 5 #include "chrome/browser/views/dropdown_bar_host.h" |
6 | 6 |
7 #include "app/keyboard_codes.h" | 7 #include "app/keyboard_codes.h" |
8 #include "app/slide_animation.h" | 8 #include "app/slide_animation.h" |
9 #include "base/scoped_handle.h" | 9 #include "base/scoped_handle.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/view_ids.h" | |
12 #include "chrome/browser/views/dropdown_bar_view.h" | |
13 #include "chrome/browser/views/frame/browser_view.h" | |
14 #include "chrome/browser/tab_contents/tab_contents.h" | 11 #include "chrome/browser/tab_contents/tab_contents.h" |
15 #include "chrome/browser/tab_contents/tab_contents_view.h" | 12 #include "chrome/browser/tab_contents/tab_contents_view.h" |
16 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/view_ids.h" |
| 15 #include "chrome/browser/ui/views/dropdown_bar_view.h" |
| 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
17 #include "gfx/path.h" | 17 #include "gfx/path.h" |
18 #include "gfx/scrollbar_size.h" | 18 #include "gfx/scrollbar_size.h" |
19 #include "views/focus/external_focus_tracker.h" | 19 #include "views/focus/external_focus_tracker.h" |
20 #include "views/focus/view_storage.h" | 20 #include "views/focus/view_storage.h" |
21 #include "views/widget/widget.h" | 21 #include "views/widget/widget.h" |
22 | 22 |
23 #if defined(OS_LINUX) | 23 #if defined(OS_LINUX) |
24 #include "app/scoped_handle_gtk.h" | 24 #include "app/scoped_handle_gtk.h" |
25 #endif | 25 #endif |
26 | 26 |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 focus_manager_->RegisterAccelerator(escape, this); | 301 focus_manager_->RegisterAccelerator(escape, this); |
302 esc_accel_target_registered_ = true; | 302 esc_accel_target_registered_ = true; |
303 } | 303 } |
304 | 304 |
305 void DropdownBarHost::UnregisterAccelerators() { | 305 void DropdownBarHost::UnregisterAccelerators() { |
306 DCHECK(esc_accel_target_registered_); | 306 DCHECK(esc_accel_target_registered_); |
307 views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); | 307 views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); |
308 focus_manager_->UnregisterAccelerator(escape, this); | 308 focus_manager_->UnregisterAccelerator(escape, this); |
309 esc_accel_target_registered_ = false; | 309 esc_accel_target_registered_ = false; |
310 } | 310 } |
OLD | NEW |