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

Side by Side Diff: content/shell/browser/shell_platform_data_aura.h

Issue 261553002: Revert of Move DefaultActivationClient to wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 10
11 namespace aura { 11 namespace aura {
12 namespace client { 12 namespace client {
13 class DefaultActivationClient;
13 class DefaultCaptureClient; 14 class DefaultCaptureClient;
14 class FocusClient; 15 class FocusClient;
15 class WindowTreeClient; 16 class WindowTreeClient;
16 } 17 }
17 } 18 }
18 19
19 namespace gfx { 20 namespace gfx {
20 class Size; 21 class Size;
21 } 22 }
22 23
23 namespace ui { 24 namespace ui {
24 class EventHandler; 25 class EventHandler;
25 } 26 }
26 27
27 namespace content { 28 namespace content {
28 29
29 class ShellPlatformDataAura { 30 class ShellPlatformDataAura {
30 public: 31 public:
31 explicit ShellPlatformDataAura(const gfx::Size& initial_size); 32 explicit ShellPlatformDataAura(const gfx::Size& initial_size);
32 ~ShellPlatformDataAura(); 33 ~ShellPlatformDataAura();
33 34
34 void ShowWindow(); 35 void ShowWindow();
35 void ResizeWindow(const gfx::Size& size); 36 void ResizeWindow(const gfx::Size& size);
36 37
37 aura::WindowTreeHost* host() { return host_.get(); } 38 aura::WindowTreeHost* host() { return host_.get(); }
38 39
39 private: 40 private:
40 scoped_ptr<aura::WindowTreeHost> host_; 41 scoped_ptr<aura::WindowTreeHost> host_;
41 scoped_ptr<aura::client::FocusClient> focus_client_; 42 scoped_ptr<aura::client::FocusClient> focus_client_;
43 scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
42 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 44 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
43 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; 45 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
44 scoped_ptr<ui::EventHandler> ime_filter_; 46 scoped_ptr<ui::EventHandler> ime_filter_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura); 48 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura);
47 }; 49 };
48 50
49 } // namespace content 51 } // namespace content
50 52
51 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ 53 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
OLDNEW
« no previous file with comments | « content/public/test/test_renderer_host.cc ('k') | content/shell/browser/shell_platform_data_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698