| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_AURA_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_AURA_H_ |
| 6 #define CONTENT_SHELL_BROWSER_SHELL_AURA_H_ | 6 #define CONTENT_SHELL_BROWSER_SHELL_AURA_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 | 9 |
| 10 namespace aura { | 10 namespace aura { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 scoped_ptr<aura::client::DefaultActivationClient> activation_client_; | 37 scoped_ptr<aura::client::DefaultActivationClient> activation_client_; |
| 38 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 38 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 39 scoped_ptr<ui::EventHandler> ime_filter_; | 39 scoped_ptr<ui::EventHandler> ime_filter_; |
| 40 | 40 |
| 41 DISALLOW_COPY_AND_ASSIGN(ShellAuraPlatformData); | 41 DISALLOW_COPY_AND_ASSIGN(ShellAuraPlatformData); |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 } // namespace content | 44 } // namespace content |
| 45 | 45 |
| 46 #endif // CONTENT_SHELL_BROWSER_SHELL_AURA_H_ | 46 #endif // CONTENT_SHELL_BROWSER_SHELL_AURA_H_ |
| OLD | NEW |