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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "apps/shell/browser/shell_content_browser_client.h" 5 #include "apps/shell/browser/shell_content_browser_client.h"
6 6
7 #include "apps/shell/browser/shell_browser_context.h" 7 #include "apps/shell/browser/shell_browser_context.h"
8 #include "apps/shell/browser/shell_browser_main_parts.h" 8 #include "apps/shell/browser/shell_browser_main_parts.h"
9 #include "apps/shell/browser/shell_extension_system.h" 9 #include "apps/shell/browser/shell_extension_system.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 16 matching lines...) Expand all
27 using content::BrowserThread; 27 using content::BrowserThread;
28 using extensions::ExtensionRegistry; 28 using extensions::ExtensionRegistry;
29 29
30 namespace apps { 30 namespace apps {
31 namespace { 31 namespace {
32 32
33 ShellContentBrowserClient* g_instance = NULL; 33 ShellContentBrowserClient* g_instance = NULL;
34 34
35 } // namespace 35 } // namespace
36 36
37 ShellContentBrowserClient::ShellContentBrowserClient() 37 ShellContentBrowserClient::ShellContentBrowserClient(
38 : browser_main_parts_(NULL) { 38 StartCallback* start_callback)
39 : browser_main_parts_(NULL), start_callback_(start_callback) {
39 DCHECK(!g_instance); 40 DCHECK(!g_instance);
40 g_instance = this; 41 g_instance = this;
41 } 42 }
42 43
43 ShellContentBrowserClient::~ShellContentBrowserClient() { g_instance = NULL; } 44 ShellContentBrowserClient::~ShellContentBrowserClient() { g_instance = NULL; }
44 45
45 // static 46 // static
46 ShellContentBrowserClient* ShellContentBrowserClient::Get() { 47 ShellContentBrowserClient* ShellContentBrowserClient::Get() {
47 return g_instance; 48 return g_instance;
48 } 49 }
49 50
50 content::BrowserContext* ShellContentBrowserClient::GetBrowserContext() { 51 content::BrowserContext* ShellContentBrowserClient::GetBrowserContext() {
51 return browser_main_parts_->browser_context(); 52 return browser_main_parts_->browser_context();
52 } 53 }
53 54
54 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( 55 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
55 const content::MainFunctionParams& parameters) { 56 const content::MainFunctionParams& parameters) {
56 browser_main_parts_ = new ShellBrowserMainParts(parameters); 57 browser_main_parts_ = new ShellBrowserMainParts(parameters, start_callback_);
57 return browser_main_parts_; 58 return browser_main_parts_;
58 } 59 }
59 60
60 void ShellContentBrowserClient::RenderProcessWillLaunch( 61 void ShellContentBrowserClient::RenderProcessWillLaunch(
61 content::RenderProcessHost* host) { 62 content::RenderProcessHost* host) {
62 int render_process_id = host->GetID(); 63 int render_process_id = host->GetID();
63 host->AddFilter(new extensions::ExtensionMessageFilter( 64 host->AddFilter(new extensions::ExtensionMessageFilter(
64 render_process_id, browser_main_parts_->browser_context())); 65 render_process_id, browser_main_parts_->browser_context()));
65 } 66 }
66 67
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 180
180 const extensions::Extension* ShellContentBrowserClient::GetExtension( 181 const extensions::Extension* ShellContentBrowserClient::GetExtension(
181 content::SiteInstance* site_instance) { 182 content::SiteInstance* site_instance) {
182 ExtensionRegistry* registry = 183 ExtensionRegistry* registry =
183 ExtensionRegistry::Get(site_instance->GetBrowserContext()); 184 ExtensionRegistry::Get(site_instance->GetBrowserContext());
184 return registry->enabled_extensions().GetExtensionOrAppByURL( 185 return registry->enabled_extensions().GetExtensionOrAppByURL(
185 site_instance->GetSiteURL()); 186 site_instance->GetSiteURL());
186 } 187 }
187 188
188 } // namespace apps 189 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698