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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.h

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-merge Created 6 years, 8 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 (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 ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/browser_main_parts.h" 10 #include "content/public/browser/browser_main_parts.h"
11 11
12 namespace base { 12 namespace base {
13 class Thread; 13 class Thread;
14 } 14 }
15 15
16 namespace content { 16 namespace content {
17 class ShellBrowserContext; 17 class ShellBrowserContext;
18 struct MainFunctionParams; 18 struct MainFunctionParams;
19 } 19 }
20 20
21 namespace net { 21 namespace net {
22 class NetLog; 22 class NetLog;
23 } 23 }
24 24
25 namespace ui {
26 class PlatformEventSource;
27 }
28
25 namespace wm { 29 namespace wm {
26 class WMState; 30 class WMState;
27 } 31 }
28 32
29 namespace ash { 33 namespace ash {
30 namespace shell { 34 namespace shell {
31 35
32 class ShellDelegateImpl; 36 class ShellDelegateImpl;
33 class WindowWatcher; 37 class WindowWatcher;
34 38
(...skipping 14 matching lines...) Expand all
49 content::ShellBrowserContext* browser_context() { 53 content::ShellBrowserContext* browser_context() {
50 return browser_context_.get(); 54 return browser_context_.get();
51 } 55 }
52 56
53 private: 57 private:
54 scoped_ptr<net::NetLog> net_log_; 58 scoped_ptr<net::NetLog> net_log_;
55 scoped_ptr<content::ShellBrowserContext> browser_context_; 59 scoped_ptr<content::ShellBrowserContext> browser_context_;
56 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; 60 scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
57 ShellDelegateImpl* delegate_; // owned by Shell 61 ShellDelegateImpl* delegate_; // owned by Shell
58 scoped_ptr<wm::WMState> wm_state_; 62 scoped_ptr<wm::WMState> wm_state_;
63 scoped_ptr<ui::PlatformEventSource> event_source_;
59 64
60 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 65 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
61 }; 66 };
62 67
63 } // namespace shell 68 } // namespace shell
64 } // namespace ash 69 } // namespace ash
65 70
66 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 71 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_interactive_uitest.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698