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

Side by Side Diff: trunk/src/content/shell/browser/shell_aura.h

Issue 27993005: Revert 229521 "Revert 229507 "aura: Allow creating content_shell..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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
« no previous file with comments | « trunk/src/content/shell/browser/shell.cc ('k') | trunk/src/content/shell/browser/shell_aura.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 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
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_
OLDNEW
« no previous file with comments | « trunk/src/content/shell/browser/shell.cc ('k') | trunk/src/content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698