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

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter_controller.cc

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/events/event_rewriter_controller.h" 5 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/events/event_source.h" 10 #include "ui/events/event_source.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 EventRewriterController::EventRewriterController() : initialized_(false) { 14 EventRewriterController::EventRewriterController() : initialized_(false) {
15 // Add the controller as an observer for new root windows. 15 // Add the controller as an observer for new root windows.
16 aura::Env::GetInstance()->AddObserver(this); 16 aura::Env::GetInstance()->AddObserver(this);
17 } 17 }
18 18
19 EventRewriterController::~EventRewriterController() { 19 EventRewriterController::~EventRewriterController() {
20 aura::Env::GetInstance()->RemoveObserver(this); 20 aura::Env::GetInstance()->RemoveObserver(this);
21 // Remove the rewriters from every root window EventSource and destroy them. 21 // Remove the rewriters from every root window EventSource and destroy them.
22 #if !defined(USE_ATHENA)
23 // TODO(oshima): Support accessibility on athena. crbug.com/408733.
oshima 2014/09/10 20:42:27 you should be able to revert this change now (It's
Dmitry Polukhin 2014/09/10 21:28:41 Done.
22 for (EventRewriters::iterator rewriter_iter = rewriters_.begin(); 24 for (EventRewriters::iterator rewriter_iter = rewriters_.begin();
23 rewriter_iter != rewriters_.end(); 25 rewriter_iter != rewriters_.end();
24 ++rewriter_iter) { 26 ++rewriter_iter) {
25 aura::Window::Windows windows = ash::Shell::GetAllRootWindows(); 27 aura::Window::Windows windows = ash::Shell::GetAllRootWindows();
26 for (aura::Window::Windows::iterator window_iter = windows.begin(); 28 for (aura::Window::Windows::iterator window_iter = windows.begin();
27 window_iter != windows.end(); 29 window_iter != windows.end();
28 ++window_iter) { 30 ++window_iter) {
29 (*window_iter)->GetHost()->GetEventSource()->RemoveEventRewriter( 31 (*window_iter)->GetHost()->GetEventSource()->RemoveEventRewriter(
30 *rewriter_iter); 32 *rewriter_iter);
31 } 33 }
32 } 34 }
35 #endif
33 rewriters_.clear(); 36 rewriters_.clear();
34 } 37 }
35 38
36 void EventRewriterController::AddEventRewriter( 39 void EventRewriterController::AddEventRewriter(
37 scoped_ptr<ui::EventRewriter> rewriter) { 40 scoped_ptr<ui::EventRewriter> rewriter) {
38 DCHECK(!initialized_); 41 DCHECK(!initialized_);
39 rewriters_.push_back(rewriter.release()); 42 rewriters_.push_back(rewriter.release());
40 } 43 }
41 44
42 void EventRewriterController::Init() { 45 void EventRewriterController::Init() {
(...skipping 15 matching lines...) Expand all
58 61
59 void EventRewriterController::AddToEventSource(ui::EventSource* source) { 62 void EventRewriterController::AddToEventSource(ui::EventSource* source) {
60 DCHECK(source); 63 DCHECK(source);
61 for (EventRewriters::iterator it = rewriters_.begin(); it != rewriters_.end(); 64 for (EventRewriters::iterator it = rewriters_.begin(); it != rewriters_.end();
62 ++it) { 65 ++it) {
63 source->AddEventRewriter(*it); 66 source->AddEventRewriter(*it);
64 } 67 }
65 } 68 }
66 69
67 } // namespace chromeos 70 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698