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

Side by Side Diff: content/shell/shell_stacking_client_ash.h

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ 5 #ifndef CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
6 #define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ 6 #define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/aura/client/stacking_client.h" 10 #include "ui/aura/client/stacking_client.h"
11 11
12 namespace aura { 12 namespace aura {
13 class RootWindow; 13 class RootWindow;
14 class Window; 14 class Window;
15 namespace client {
16 class DefaultCaptureClient;
17 }
15 namespace shared { 18 namespace shared {
16 class CompoundEventFilter; 19 class CompoundEventFilter;
17 class InputMethodEventFilter; 20 class InputMethodEventFilter;
18 class RootWindowCaptureClient;
19 } 21 }
20 namespace test { 22 namespace test {
21 class TestActivationClient; 23 class TestActivationClient;
22 } 24 }
23 } 25 }
24 26
25 namespace gfx { 27 namespace gfx {
26 class Rect; 28 class Rect;
27 } 29 }
28 30
(...skipping 10 matching lines...) Expand all
39 // Overridden from client::StackingClient: 41 // Overridden from client::StackingClient:
40 virtual aura::Window* GetDefaultParent(aura::Window* window, 42 virtual aura::Window* GetDefaultParent(aura::Window* window,
41 const gfx::Rect& bounds) OVERRIDE; 43 const gfx::Rect& bounds) OVERRIDE;
42 44
43 private: 45 private:
44 scoped_ptr<aura::RootWindow> root_window_; 46 scoped_ptr<aura::RootWindow> root_window_;
45 47
46 // Owned by RootWindow 48 // Owned by RootWindow
47 aura::shared::CompoundEventFilter* root_window_event_filter_; 49 aura::shared::CompoundEventFilter* root_window_event_filter_;
48 50
49 scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_; 51 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
50 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; 52 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
51 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 53 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
52 54
53 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh); 55 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh);
54 }; 56 };
55 57
56 } // namespace content; 58 } // namespace content;
57 59
58 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ 60 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
OLDNEW
« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698