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

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

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « ui/aura/window.cc ('k') | ui/views/examples/content_client/examples_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 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/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 aura {
13 namespace client {
14 class StackingClient;
15 }
16 }
17
12 namespace content { 18 namespace content {
13 class ShellBrowserContext; 19 class ShellBrowserContext;
14 struct MainFunctionParams; 20 struct MainFunctionParams;
15 } 21 }
16 22
17 namespace views { 23 namespace views {
18 class ViewsDelegate; 24 class ViewsDelegate;
19 25
20 namespace examples { 26 namespace examples {
21 27
22 class ExamplesBrowserMainParts : public content::BrowserMainParts { 28 class ExamplesBrowserMainParts : public content::BrowserMainParts {
23 public: 29 public:
24 explicit ExamplesBrowserMainParts( 30 explicit ExamplesBrowserMainParts(
25 const content::MainFunctionParams& parameters); 31 const content::MainFunctionParams& parameters);
26 virtual ~ExamplesBrowserMainParts(); 32 virtual ~ExamplesBrowserMainParts();
27 33
28 // Overridden from content::BrowserMainParts: 34 // Overridden from content::BrowserMainParts:
29 virtual void PreMainMessageLoopRun() OVERRIDE; 35 virtual void PreMainMessageLoopRun() OVERRIDE;
30 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 36 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
31 virtual void PostMainMessageLoopRun() OVERRIDE; 37 virtual void PostMainMessageLoopRun() OVERRIDE;
32 38
33 content::ShellBrowserContext* browser_context() { 39 content::ShellBrowserContext* browser_context() {
34 return browser_context_.get(); 40 return browser_context_.get();
35 } 41 }
36 42
37 private: 43 private:
38 scoped_ptr<content::ShellBrowserContext> browser_context_; 44 scoped_ptr<content::ShellBrowserContext> browser_context_;
39 45
40 scoped_ptr<ViewsDelegate> views_delegate_; 46 scoped_ptr<ViewsDelegate> views_delegate_;
47 #if defined(USE_AURA)
48 scoped_ptr<aura::client::StackingClient> stacking_client_;
49 #endif
41 50
42 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts); 51 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
43 }; 52 };
44 53
45 } // namespace examples 54 } // namespace examples
46 } // namespace views 55 } // namespace views
47 56
48 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 57 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ui/aura/window.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