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

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

Issue 10479023: Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove unused function declaration Created 8 years, 6 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_SHELL_MAIN_DELEGATE_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 11 matching lines...) Expand all
22 22
23 class ShellContentBrowserClient; 23 class ShellContentBrowserClient;
24 24
25 class ShellMainDelegate : public content::ContentMainDelegate { 25 class ShellMainDelegate : public content::ContentMainDelegate {
26 public: 26 public:
27 ShellMainDelegate(); 27 ShellMainDelegate();
28 virtual ~ShellMainDelegate(); 28 virtual ~ShellMainDelegate();
29 29
30 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; 30 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
31 virtual void PreSandboxStartup() OVERRIDE; 31 virtual void PreSandboxStartup() OVERRIDE;
32 #if defined(OS_POSIX) 32 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
33 virtual void ZygoteForked() OVERRIDE;
34 #endif // OS_MACOSX
35 33
36 private: 34 private:
37 void InitializeShellContentClient(const std::string& process_type);
38 void InitializeResourceBundle(); 35 void InitializeResourceBundle();
39 36
40 scoped_ptr<ShellContentBrowserClient> browser_client_; 37 scoped_ptr<ShellContentBrowserClient> browser_client_;
41 scoped_ptr<content::ShellContentRendererClient> renderer_client_;
42 scoped_ptr<content::ShellContentPluginClient> plugin_client_;
43 scoped_ptr<content::ShellContentUtilityClient> utility_client_;
44 content::ShellContentClient content_client_; 38 content::ShellContentClient content_client_;
45 39
46 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 40 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
47 }; 41 };
48 42
49 } // namespace shell 43 } // namespace shell
50 } // namespace ash 44 } // namespace ash
51 45
52 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 46 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell/content_client/shell_main_delegate.cc » ('j') | content/shell/shell_main_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698