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

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

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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 | « no previous file | ash/shell/content_client/shell_browser_main_parts.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 (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 views {
26 namespace corewm {
27 class WMState;
28 }
29 }
30
25 namespace ash { 31 namespace ash {
26 namespace shell { 32 namespace shell {
27 33
28 class ShellDelegateImpl; 34 class ShellDelegateImpl;
29 class WindowWatcher; 35 class WindowWatcher;
30 36
31 class ShellBrowserMainParts : public content::BrowserMainParts { 37 class ShellBrowserMainParts : public content::BrowserMainParts {
32 public: 38 public:
33 explicit ShellBrowserMainParts( 39 explicit ShellBrowserMainParts(
34 const content::MainFunctionParams& parameters); 40 const content::MainFunctionParams& parameters);
35 virtual ~ShellBrowserMainParts(); 41 virtual ~ShellBrowserMainParts();
36 42
37 // Overridden from content::BrowserMainParts: 43 // Overridden from content::BrowserMainParts:
38 virtual void PreMainMessageLoopStart() OVERRIDE; 44 virtual void PreMainMessageLoopStart() OVERRIDE;
39 virtual void PostMainMessageLoopStart() OVERRIDE; 45 virtual void PostMainMessageLoopStart() OVERRIDE;
46 virtual void ToolkitInitialized() OVERRIDE;
40 virtual void PreMainMessageLoopRun() OVERRIDE; 47 virtual void PreMainMessageLoopRun() OVERRIDE;
41 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 48 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
42 virtual void PostMainMessageLoopRun() OVERRIDE; 49 virtual void PostMainMessageLoopRun() OVERRIDE;
43 50
44 content::ShellBrowserContext* browser_context() { 51 content::ShellBrowserContext* browser_context() {
45 return browser_context_.get(); 52 return browser_context_.get();
46 } 53 }
47 54
48 private: 55 private:
49 scoped_ptr<net::NetLog> net_log_; 56 scoped_ptr<net::NetLog> net_log_;
50 scoped_ptr<content::ShellBrowserContext> browser_context_; 57 scoped_ptr<content::ShellBrowserContext> browser_context_;
51 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; 58 scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
52 ShellDelegateImpl* delegate_; // owned by Shell 59 ShellDelegateImpl* delegate_; // owned by Shell
60 scoped_ptr<views::corewm::WMState> wm_state_;
53 61
54 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 62 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
55 }; 63 };
56 64
57 } // namespace shell 65 } // namespace shell
58 } // namespace ash 66 } // namespace ash
59 67
60 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 68 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698