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

Unified Diff: apps/shell/browser/shell_content_browser_client.cc

Issue 270763002: Minimal athena shell main (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/browser/shell_content_browser_client.h ('k') | athena/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_content_browser_client.cc
diff --git a/apps/shell/browser/shell_content_browser_client.cc b/apps/shell/browser/shell_content_browser_client.cc
index ca9db4e8686fc7c58513bb6e871f253342b7597b..c61a8c89992348ac7f89f447a9b9bd0f4aee404c 100644
--- a/apps/shell/browser/shell_content_browser_client.cc
+++ b/apps/shell/browser/shell_content_browser_client.cc
@@ -34,8 +34,9 @@ ShellContentBrowserClient* g_instance = NULL;
} // namespace
-ShellContentBrowserClient::ShellContentBrowserClient()
- : browser_main_parts_(NULL) {
+ShellContentBrowserClient::ShellContentBrowserClient(
+ ShellBrowserMainDelegate* browser_main_delegate)
+ : browser_main_parts_(NULL), browser_main_delegate_(browser_main_delegate) {
DCHECK(!g_instance);
g_instance = this;
}
@@ -53,7 +54,8 @@ content::BrowserContext* ShellContentBrowserClient::GetBrowserContext() {
content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
const content::MainFunctionParams& parameters) {
- browser_main_parts_ = new ShellBrowserMainParts(parameters);
+ browser_main_parts_ =
+ new ShellBrowserMainParts(parameters, browser_main_delegate_);
return browser_main_parts_;
}
« no previous file with comments | « apps/shell/browser/shell_content_browser_client.h ('k') | athena/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698