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

Side by Side Diff: chrome/browser/ui/views/dropdown_bar_host.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "app/keyboard_codes.h"
8 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/view_ids.h" 8 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/browser/ui/views/dropdown_bar_view.h" 9 #include "chrome/browser/ui/views/dropdown_bar_view.h"
11 #include "chrome/browser/ui/views/frame/browser_view.h" 10 #include "chrome/browser/ui/views/frame/browser_view.h"
12 #include "gfx/path.h" 11 #include "gfx/path.h"
13 #include "gfx/scrollbar_size.h" 12 #include "gfx/scrollbar_size.h"
14 #include "ui/base/animation/slide_animation.h" 13 #include "ui/base/animation/slide_animation.h"
14 #include "ui/base/keycodes/keyboard_codes.h"
15 #include "views/focus/external_focus_tracker.h" 15 #include "views/focus/external_focus_tracker.h"
16 #include "views/focus/view_storage.h" 16 #include "views/focus/view_storage.h"
17 #include "views/widget/widget.h" 17 #include "views/widget/widget.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "base/win/scoped_gdi_object.h" 20 #include "base/win/scoped_gdi_object.h"
21 #elif defined(OS_LINUX) 21 #elif defined(OS_LINUX)
22 #include "app/scoped_handle_gtk.h" 22 #include "app/scoped_handle_gtk.h"
23 #endif 23 #endif
24 24
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 ScopedPlatformRegion exclude_region(exclude_path.CreateNativeRegion()); 298 ScopedPlatformRegion exclude_region(exclude_path.CreateNativeRegion());
299 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get())); 299 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get()));
300 } 300 }
301 301
302 // Window takes ownership of the region. 302 // Window takes ownership of the region.
303 host()->SetShape(region.release()); 303 host()->SetShape(region.release());
304 } 304 }
305 305
306 void DropdownBarHost::RegisterAccelerators() { 306 void DropdownBarHost::RegisterAccelerators() {
307 DCHECK(!esc_accel_target_registered_); 307 DCHECK(!esc_accel_target_registered_);
308 views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); 308 views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
309 focus_manager_->RegisterAccelerator(escape, this); 309 focus_manager_->RegisterAccelerator(escape, this);
310 esc_accel_target_registered_ = true; 310 esc_accel_target_registered_ = true;
311 } 311 }
312 312
313 void DropdownBarHost::UnregisterAccelerators() { 313 void DropdownBarHost::UnregisterAccelerators() {
314 DCHECK(esc_accel_target_registered_); 314 DCHECK(esc_accel_target_registered_);
315 views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); 315 views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
316 focus_manager_->UnregisterAccelerator(escape, this); 316 focus_manager_->UnregisterAccelerator(escape, this);
317 esc_accel_target_registered_ = false; 317 esc_accel_target_registered_ = false;
318 } 318 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/download_item_view.cc ('k') | chrome/browser/ui/views/dropdown_bar_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698