chrome/browser/ui/views/dropdown_bar_host.cc - Issue 10446010: wip: Add ui::EventType parameter.

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 10446010: wip: Add ui::EventType parameter. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wip - views_unittests Created 8 years, 7 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/chrome_to_mobile_bubble_view.cc ('k') | chrome/browser/ui/views/find_bar_host.cc » ('j') | no next file with comments »

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 316 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
327 ScopedPlatformRegion exclude_region(exclude_path.CreateNativeRegion());	327 ScopedPlatformRegion exclude_region(exclude_path.CreateNativeRegion());

328 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get()));	328 region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get()));

329 }	329 }

330	330

331 // Window takes ownership of the region.	331 // Window takes ownership of the region.

332 host()->SetShape(region.release());	332 host()->SetShape(region.release());

333 }	333 }

334	334

335 void DropdownBarHost::RegisterAccelerators() {	335 void DropdownBarHost::RegisterAccelerators() {

336 DCHECK(!esc_accel_target_registered_);	336 DCHECK(!esc_accel_target_registered_);

337 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);	337 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE, ui::ET_KEY_PRESSED);

338 focus_manager_->RegisterAccelerator(	338 focus_manager_->RegisterAccelerator(

339 escape, ui::AcceleratorManager::kNormalPriority, this);	339 escape, ui::AcceleratorManager::kNormalPriority, 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, ui::EF_NONE);	345 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE, ui::ET_KEY_PRESSED);

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 }

OLD	NEW