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

Side by Side Diff: ui/views/examples/content_client/examples_browser_main_parts.h

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 5 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
6 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 6 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.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 content { 12 namespace content {
13 class ShellBrowserContext; 13 class ShellBrowserContext;
14 struct MainFunctionParams; 14 struct MainFunctionParams;
15 } 15 }
16 16
17 namespace wm { 17 namespace wm {
18 class WMState;
18 class WMTestHelper; 19 class WMTestHelper;
19 } 20 }
20 21
21 namespace views { 22 namespace views {
22 class ViewsDelegate; 23 class ViewsDelegate;
23 24
24 namespace corewm {
25 class WMState;
26 }
27
28 namespace examples { 25 namespace examples {
29 26
30 class ExamplesBrowserMainParts : public content::BrowserMainParts { 27 class ExamplesBrowserMainParts : public content::BrowserMainParts {
31 public: 28 public:
32 explicit ExamplesBrowserMainParts( 29 explicit ExamplesBrowserMainParts(
33 const content::MainFunctionParams& parameters); 30 const content::MainFunctionParams& parameters);
34 virtual ~ExamplesBrowserMainParts(); 31 virtual ~ExamplesBrowserMainParts();
35 32
36 // content::BrowserMainParts: 33 // content::BrowserMainParts:
37 virtual void ToolkitInitialized() OVERRIDE; 34 virtual void ToolkitInitialized() OVERRIDE;
38 virtual void PreMainMessageLoopRun() OVERRIDE; 35 virtual void PreMainMessageLoopRun() OVERRIDE;
39 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 36 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
40 virtual void PostMainMessageLoopRun() OVERRIDE; 37 virtual void PostMainMessageLoopRun() OVERRIDE;
41 38
42 content::ShellBrowserContext* browser_context() { 39 content::ShellBrowserContext* browser_context() {
43 return browser_context_.get(); 40 return browser_context_.get();
44 } 41 }
45 42
46 private: 43 private:
47 scoped_ptr<content::ShellBrowserContext> browser_context_; 44 scoped_ptr<content::ShellBrowserContext> browser_context_;
48 45
49 scoped_ptr<ViewsDelegate> views_delegate_; 46 scoped_ptr<ViewsDelegate> views_delegate_;
50 47
51 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
52 // Enable a minimal set of views::corewm to be initialized. 49 // Enable a minimal set of views::corewm to be initialized.
53 scoped_ptr<wm::WMTestHelper> wm_test_helper_; 50 scoped_ptr<wm::WMTestHelper> wm_test_helper_;
54 #endif 51 #endif
55 52
56 scoped_ptr<views::corewm::WMState> wm_state_; 53 scoped_ptr<wm::WMState> wm_state_;
57 54
58 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts); 55 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
59 }; 56 };
60 57
61 } // namespace examples 58 } // namespace examples
62 } // namespace views 59 } // namespace views
63 60
64 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 61 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698