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

Side by Side Diff: ui/aura_shell/app_list.cc

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, review Created 9 years 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 "ui/aura_shell/app_list.h" 5 #include "ui/aura_shell/app_list.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/event.h" 8 #include "ui/aura/event.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura_shell/shell.h" 10 #include "ui/aura_shell/shell.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } 118 }
119 119
120 //////////////////////////////////////////////////////////////////////////////// 120 ////////////////////////////////////////////////////////////////////////////////
121 // AppList, aura::EventFilter implementation: 121 // AppList, aura::EventFilter implementation:
122 122
123 bool AppList::PreHandleKeyEvent(aura::Window* target, 123 bool AppList::PreHandleKeyEvent(aura::Window* target,
124 aura::KeyEvent* event) { 124 aura::KeyEvent* event) {
125 return false; 125 return false;
126 } 126 }
127 127
128 bool AppList::PreHandleTranslatedKeyEvent(
129 aura::Window* target,
130 aura::TranslatedKeyEvent* event) {
131 return false;
132 }
133
128 bool AppList::PreHandleMouseEvent(aura::Window* target, 134 bool AppList::PreHandleMouseEvent(aura::Window* target,
129 aura::MouseEvent* event) { 135 aura::MouseEvent* event) {
130 if (widget_ && is_visible_ && event->type() == ui::ET_MOUSE_PRESSED) { 136 if (widget_ && is_visible_ && event->type() == ui::ET_MOUSE_PRESSED) {
131 aura::MouseEvent translated(*event, target, widget_->GetNativeView()); 137 aura::MouseEvent translated(*event, target, widget_->GetNativeView());
132 if (!widget_->GetNativeView()->ContainsPoint(translated.location())) 138 if (!widget_->GetNativeView()->ContainsPoint(translated.location()))
133 SetVisible(false); 139 SetVisible(false);
134 } 140 }
135 return false; 141 return false;
136 } 142 }
137 143
(...skipping 30 matching lines...) Expand all
168 } 174 }
169 175
170 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) { 176 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
171 DCHECK(widget_ == widget); 177 DCHECK(widget_ == widget);
172 if (widget_ && is_visible_ && !active) 178 if (widget_ && is_visible_ && !active)
173 SetVisible(false); 179 SetVisible(false);
174 } 180 }
175 181
176 } // namespace internal 182 } // namespace internal
177 } // namespace aura_shell 183 } // namespace aura_shell
OLDNEW
« ui/aura/event.h ('K') | « ui/aura_shell/app_list.h ('k') | ui/aura_shell/aura_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698