chrome/browser/ui/views/dropdown_bar_host.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing 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

« no previous file with comments | « chrome/browser/ui/views/download_shelf_view.cc ('k') | chrome/browser/ui/views/dropdown_bar_host_gtk.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 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/views/dropdown_bar_host.h"	5 #include "chrome/browser/ui/views/dropdown_bar_host.h"

6	6

7 #include "app/keyboard_codes.h"	7 #include "app/keyboard_codes.h"

8 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.h"

9 #include "chrome/browser/ui/view_ids.h"	9 #include "chrome/browser/ui/view_ids.h"

10 #include "chrome/browser/ui/views/dropdown_bar_view.h"	10 #include "chrome/browser/ui/views/dropdown_bar_view.h"

11 #include "chrome/browser/ui/views/frame/browser_view.h"	11 #include "chrome/browser/ui/views/frame/browser_view.h"

12 #include "gfx/path.h"	12 #include "gfx/path.h"

13 #include "gfx/scrollbar_size.h"	13 #include "gfx/scrollbar_size.h"

14 #include "ui/base/animation/slide_animation.h"	14 #include "ui/base/animation/slide_animation.h"

15 #include "views/focus/external_focus_tracker.h"	15 #include "views/focus/external_focus_tracker.h"

(...skipping 293 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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(app::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 }

OLD	NEW