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" |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get())); | 332 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get())); |
333 } | 333 } |
334 | 334 |
335 // Window takes ownership of the region. | 335 // Window takes ownership of the region. |
336 host()->SetShape(region.release()); | 336 host()->SetShape(region.release()); |
337 } | 337 } |
338 | 338 |
339 void DropdownBarHost::RegisterAccelerators() { | 339 void DropdownBarHost::RegisterAccelerators() { |
340 DCHECK(!esc_accel_target_registered_); | 340 DCHECK(!esc_accel_target_registered_); |
341 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); | 341 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); |
342 focus_manager_->RegisterAccelerator(escape, this); | 342 focus_manager_->RegisterAccelerator( |
| 343 escape, ui::AcceleratorManager::kNormalPriority, this); |
343 esc_accel_target_registered_ = true; | 344 esc_accel_target_registered_ = true; |
344 } | 345 } |
345 | 346 |
346 void DropdownBarHost::UnregisterAccelerators() { | 347 void DropdownBarHost::UnregisterAccelerators() { |
347 DCHECK(esc_accel_target_registered_); | 348 DCHECK(esc_accel_target_registered_); |
348 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); | 349 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); |
349 focus_manager_->UnregisterAccelerator(escape, this); | 350 focus_manager_->UnregisterAccelerator(escape, this); |
350 esc_accel_target_registered_ = false; | 351 esc_accel_target_registered_ = false; |
351 } | 352 } |
OLD | NEW |