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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 8302016: Make GTK and Aura parts orthogonal to OS parts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved BrowserMainLoop into its own file, changed PreMainMessageLoopStart to return void Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "content/public/browser/content_browser_client.h" 12 #include "content/public/browser/content_browser_client.h"
13 13
14 namespace content {
15 class BrowserMainParts;
jam 2011/10/25 06:11:28 nit: not needed, since this is already in content_
stevenjb 2011/10/25 19:21:18 Done.
16 }
17
14 namespace chrome { 18 namespace chrome {
15 19
16 class ChromeContentBrowserClient : public content::ContentBrowserClient { 20 class ChromeContentBrowserClient : public content::ContentBrowserClient {
17 public: 21 public:
18 virtual content::BrowserMainParts* CreateBrowserMainParts( 22 virtual void CreateBrowserMainParts(
19 const MainFunctionParams& parameters) OVERRIDE; 23 const MainFunctionParams& parameters,
24 std::vector<content::BrowserMainParts*>& parts_list) OVERRIDE;
20 virtual RenderWidgetHostView* CreateViewForWidget( 25 virtual RenderWidgetHostView* CreateViewForWidget(
21 RenderWidgetHost* widget) OVERRIDE; 26 RenderWidgetHost* widget) OVERRIDE;
22 virtual TabContentsView* CreateTabContentsView( 27 virtual TabContentsView* CreateTabContentsView(
23 TabContents* tab_contents) OVERRIDE; 28 TabContents* tab_contents) OVERRIDE;
24 virtual void RenderViewHostCreated(RenderViewHost* render_view_host) OVERRIDE; 29 virtual void RenderViewHostCreated(RenderViewHost* render_view_host) OVERRIDE;
25 virtual void BrowserRenderProcessHostCreated( 30 virtual void BrowserRenderProcessHostCreated(
26 BrowserRenderProcessHost* host) OVERRIDE; 31 BrowserRenderProcessHost* host) OVERRIDE;
27 virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE; 32 virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;
28 virtual void WorkerProcessHostCreated(WorkerProcessHost* host) OVERRIDE; 33 virtual void WorkerProcessHostCreated(WorkerProcessHost* host) OVERRIDE;
29 virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE; 34 virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #if defined(USE_NSS) 139 #if defined(USE_NSS)
135 virtual 140 virtual
136 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 141 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
137 const GURL& url) OVERRIDE; 142 const GURL& url) OVERRIDE;
138 #endif 143 #endif
139 }; 144 };
140 145
141 } // namespace chrome 146 } // namespace chrome
142 147
143 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 148 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698