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

Unified Diff: views/focus/focus_manager.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: views/focus/focus_manager.cc
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 82eddf4598072375808f7481b92af2b398aaa819..d0dccb47376050650ab44119cfae7720e787ec3c 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -357,7 +357,7 @@ View* FocusManager::FindFocusableView(FocusTraversable* focus_traversable,
void FocusManager::RegisterAccelerator(
const Accelerator& accelerator,
- AcceleratorTarget* target) {
+ ui::AcceleratorTarget* target) {
AcceleratorTargetList& targets = accelerators_[accelerator];
DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end())
<< "Registering the same target multiple times";
@@ -365,7 +365,7 @@ void FocusManager::RegisterAccelerator(
}
void FocusManager::UnregisterAccelerator(const Accelerator& accelerator,
- AcceleratorTarget* target) {
+ ui::AcceleratorTarget* target) {
AcceleratorMap::iterator map_iter = accelerators_.find(accelerator);
if (map_iter == accelerators_.end()) {
NOTREACHED() << "Unregistering non-existing accelerator";
@@ -383,7 +383,7 @@ void FocusManager::UnregisterAccelerator(const Accelerator& accelerator,
targets->erase(target_iter);
}
-void FocusManager::UnregisterAccelerators(AcceleratorTarget* target) {
+void FocusManager::UnregisterAccelerators(ui::AcceleratorTarget* target) {
for (AcceleratorMap::iterator map_iter = accelerators_.begin();
map_iter != accelerators_.end(); ++map_iter) {
AcceleratorTargetList* targets = &map_iter->second;
@@ -406,7 +406,7 @@ bool FocusManager::ProcessAccelerator(const Accelerator& accelerator) {
return false;
}
-AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
+ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
const views::Accelerator& accelerator) const {
AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator);
if (map_iter == accelerators_.end() || map_iter->second.empty())

Powered by Google App Engine
This is Rietveld 408576698