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

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

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 #ifndef UI_AURA_SHELL_APP_LIST_H_ 5 #ifndef UI_AURA_SHELL_APP_LIST_H_
6 #define UI_AURA_SHELL_APP_LIST_H_ 6 #define UI_AURA_SHELL_APP_LIST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 29 matching lines...) Expand all
40 40
41 // Forgets the widget. 41 // Forgets the widget.
42 void ResetWidget(); 42 void ResetWidget();
43 43
44 // Starts show/hide animation. 44 // Starts show/hide animation.
45 void ScheduleAnimation(); 45 void ScheduleAnimation();
46 46
47 // aura::EventFilter overrides: 47 // aura::EventFilter overrides:
48 virtual bool PreHandleKeyEvent(aura::Window* target, 48 virtual bool PreHandleKeyEvent(aura::Window* target,
49 aura::KeyEvent* event) OVERRIDE; 49 aura::KeyEvent* event) OVERRIDE;
50 virtual bool PreHandleTranslatedKeyEvent(
51 aura::Window* target,
52 aura::TranslatedKeyEvent* event) OVERRIDE;
50 virtual bool PreHandleMouseEvent(aura::Window* target, 53 virtual bool PreHandleMouseEvent(aura::Window* target,
51 aura::MouseEvent* event) OVERRIDE; 54 aura::MouseEvent* event) OVERRIDE;
52 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 55 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
53 aura::TouchEvent* event) OVERRIDE; 56 aura::TouchEvent* event) OVERRIDE;
54 57
55 // ui::LayerAnimationObserver overrides: 58 // ui::LayerAnimationObserver overrides:
56 virtual void OnLayerAnimationEnded( 59 virtual void OnLayerAnimationEnded(
57 const ui::LayerAnimationSequence* sequence) OVERRIDE; 60 const ui::LayerAnimationSequence* sequence) OVERRIDE;
58 virtual void OnLayerAnimationAborted( 61 virtual void OnLayerAnimationAborted(
59 const ui::LayerAnimationSequence* sequence) OVERRIDE; 62 const ui::LayerAnimationSequence* sequence) OVERRIDE;
(...skipping 14 matching lines...) Expand all
74 // A weak ptr factory for callbacks that ShellDelegate used to set widget. 77 // A weak ptr factory for callbacks that ShellDelegate used to set widget.
75 base::WeakPtrFactory<AppList> set_widget_factory_; 78 base::WeakPtrFactory<AppList> set_widget_factory_;
76 79
77 DISALLOW_COPY_AND_ASSIGN(AppList); 80 DISALLOW_COPY_AND_ASSIGN(AppList);
78 }; 81 };
79 82
80 } // namespace internal 83 } // namespace internal
81 } // namespace aura_shell 84 } // namespace aura_shell
82 85
83 #endif // UI_AURA_SHELL_APP_LIST_H_ 86 #endif // UI_AURA_SHELL_APP_LIST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698