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

Side by Side Diff: ui/views/widget/desktop_native_widget_helper_aura.h

Issue 10332145: aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to ui/aura/shared/ 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
OLDNEW
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 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/aura/root_window_observer.h" 9 #include "ui/aura/root_window_observer.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
11 #include "ui/views/views_export.h" 11 #include "ui/views/views_export.h"
12 #include "ui/views/widget/native_widget_helper_aura.h" 12 #include "ui/views/widget/native_widget_helper_aura.h"
13 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 14
15 namespace aura { 15 namespace aura {
16 class RootWindow; 16 class RootWindow;
17 namespace shared {
18 class InputMethodEventFilter;
19 class RootWindowEventFilter;
20 }
17 } 21 }
18 22
19 namespace ui { 23 namespace ui {
20 #if defined(OS_WIN) 24 #if defined(OS_WIN)
21 class HWNDSubclass; 25 class HWNDSubclass;
22 #endif 26 #endif
23 } 27 }
24 28
25 namespace views { 29 namespace views {
26 class NativeWidgetAura; 30 class NativeWidgetAura;
(...skipping 22 matching lines...) Expand all
49 const gfx::Size& old_size) OVERRIDE; 53 const gfx::Size& old_size) OVERRIDE;
50 virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE; 54 virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE;
51 55
52 private: 56 private:
53 // A weak pointer back to our owning widget. 57 // A weak pointer back to our owning widget.
54 NativeWidgetAura* widget_; 58 NativeWidgetAura* widget_;
55 59
56 // Optionally, a RootWindow that we attach ourselves to. 60 // Optionally, a RootWindow that we attach ourselves to.
57 scoped_ptr<aura::RootWindow> root_window_; 61 scoped_ptr<aura::RootWindow> root_window_;
58 62
63 // Toplevel event filter which dispatches to other event filters.
64 aura::shared::RootWindowEventFilter* root_window_event_filter_;
65
66 // An event filter that pre-handles all key events to send them to an IME.
67 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
68
59 // We want some windows (omnibox, status bar) to have their own 69 // We want some windows (omnibox, status bar) to have their own
60 // NativeWidgetAura, but still act as if they're screen bounded toplevel 70 // NativeWidgetAura, but still act as if they're screen bounded toplevel
61 // windows. 71 // windows.
62 bool is_embedded_window_; 72 bool is_embedded_window_;
63 73
64 #if defined(OS_WIN) 74 #if defined(OS_WIN)
65 scoped_ptr<ui::HWNDSubclass> subclass_; 75 scoped_ptr<ui::HWNDSubclass> subclass_;
66 #endif 76 #endif
67 77
68 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); 78 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura);
69 }; 79 };
70 80
71 } // namespace views 81 } // namespace views
72 82
73 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 83 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698