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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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 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 <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" 11 #include "chrome/browser/ui/views/dropdown_bar_view.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h" 12 #include "chrome/browser/ui/views/frame/browser_view.h"
13 #include "ui/base/animation/slide_animation.h" 13 #include "ui/base/animation/slide_animation.h"
14 #include "ui/base/keycodes/keyboard_codes.h" 14 #include "ui/base/keycodes/keyboard_codes.h"
15 #include "ui/gfx/path.h" 15 #include "ui/gfx/path.h"
16 #include "ui/gfx/scrollbar_size.h" 16 #include "ui/gfx/scrollbar_size.h"
17 #include "ui/views/focus/external_focus_tracker.h" 17 #include "ui/views/focus/external_focus_tracker.h"
18 #include "ui/views/focus/view_storage.h" 18 #include "ui/views/focus/view_storage.h"
19 #include "views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 #if defined(USE_AURA) 21 #if defined(USE_AURA)
22 #include "ui/gfx/scoped_sk_region.h" 22 #include "ui/gfx/scoped_sk_region.h"
23 #elif defined(OS_WIN) 23 #elif defined(OS_WIN)
24 #include "base/win/scoped_gdi_object.h" 24 #include "base/win/scoped_gdi_object.h"
25 #elif defined(TOOLKIT_USES_GTK) 25 #elif defined(TOOLKIT_USES_GTK)
26 #include "ui/base/gtk/scoped_handle_gtk.h" 26 #include "ui/base/gtk/scoped_handle_gtk.h"
27 #endif 27 #endif
28 28
29 namespace { 29 namespace {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 focus_manager_->RegisterAccelerator(escape, this); 339 focus_manager_->RegisterAccelerator(escape, this);
340 esc_accel_target_registered_ = true; 340 esc_accel_target_registered_ = true;
341 } 341 }
342 342
343 void DropdownBarHost::UnregisterAccelerators() { 343 void DropdownBarHost::UnregisterAccelerators() {
344 DCHECK(esc_accel_target_registered_); 344 DCHECK(esc_accel_target_registered_);
345 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); 345 ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
346 focus_manager_->UnregisterAccelerator(escape, this); 346 focus_manager_->UnregisterAccelerator(escape, this);
347 esc_accel_target_registered_ = false; 347 esc_accel_target_registered_ = false;
348 } 348 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698