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

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

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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
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
(...skipping 23 matching lines...) Expand all
34 void ShowWindow(); 34 void ShowWindow();
35 void ResizeWindow(const gfx::Size& size); 35 void ResizeWindow(const gfx::Size& size);
36 36
37 aura::WindowTreeHost* host() { return host_.get(); } 37 aura::WindowTreeHost* host() { return host_.get(); }
38 38
39 private: 39 private:
40 scoped_ptr<aura::WindowTreeHost> host_; 40 scoped_ptr<aura::WindowTreeHost> host_;
41 scoped_ptr<aura::client::FocusClient> focus_client_; 41 scoped_ptr<aura::client::FocusClient> focus_client_;
42 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 42 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
43 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; 43 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
44 scoped_ptr<ui::EventHandler> ime_filter_;
45 44
46 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura); 45 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura);
47 }; 46 };
48 47
49 } // namespace content 48 } // namespace content
50 49
51 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ 50 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698