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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And fix the final ExtensionApiTest.AlertBasic case. 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
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
18 namespace content { 12 namespace content {
19 class ShellBrowserContext; 13 class ShellBrowserContext;
20 struct MainFunctionParams; 14 struct MainFunctionParams;
21 } 15 }
22 16
23 namespace views { 17 namespace views {
24 class ViewsDelegate; 18 class ViewsDelegate;
25 19
26 namespace examples { 20 namespace examples {
27 21
28 class ExamplesBrowserMainParts : public content::BrowserMainParts { 22 class ExamplesBrowserMainParts : public content::BrowserMainParts {
29 public: 23 public:
30 explicit ExamplesBrowserMainParts( 24 explicit ExamplesBrowserMainParts(
31 const content::MainFunctionParams& parameters); 25 const content::MainFunctionParams& parameters);
32 virtual ~ExamplesBrowserMainParts(); 26 virtual ~ExamplesBrowserMainParts();
33 27
34 // Overridden from content::BrowserMainParts: 28 // Overridden from content::BrowserMainParts:
35 virtual void PreMainMessageLoopRun() OVERRIDE; 29 virtual void PreMainMessageLoopRun() OVERRIDE;
36 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 30 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
37 virtual void PostMainMessageLoopRun() OVERRIDE; 31 virtual void PostMainMessageLoopRun() OVERRIDE;
38 32
39 content::ShellBrowserContext* browser_context() { 33 content::ShellBrowserContext* browser_context() {
40 return browser_context_.get(); 34 return browser_context_.get();
41 } 35 }
42 36
43 private: 37 private:
44 scoped_ptr<content::ShellBrowserContext> browser_context_; 38 scoped_ptr<content::ShellBrowserContext> browser_context_;
45 39
46 scoped_ptr<ViewsDelegate> views_delegate_; 40 scoped_ptr<ViewsDelegate> views_delegate_;
47 #if defined(USE_AURA)
48 scoped_ptr<aura::client::StackingClient> stacking_client_;
49 #endif
50 41
51 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts); 42 DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
52 }; 43 };
53 44
54 } // namespace examples 45 } // namespace examples
55 } // namespace views 46 } // namespace views
56 47
57 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 48 #endif // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698