summaryrefslogtreecommitdiffstats
path: root/extensions/shell/app
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2014-11-06 10:50:01 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-06 18:50:26 +0000
commit3813023bde420950c60d9d12a8610510b76da337 (patch)
treec4c1a71be980404150fce8f9848ae4ac831fb0c8 /extensions/shell/app
parentba4eca9bf6691e4ed55eee55a0bcac1a932b7688 (diff)
downloadchromium_src-3813023bde420950c60d9d12a8610510b76da337.zip
chromium_src-3813023bde420950c60d9d12a8610510b76da337.tar.gz
chromium_src-3813023bde420950c60d9d12a8610510b76da337.tar.bz2
Add rudimentary UpdateService to app_shell
It can download a CRX from the web store using an ID given at the command line. This wires up utility process support for app_shell and establishes a base for factoring additional extensions utility IPCs out of //chrome in the near future. BUG=398671 TBR=asargent@chromium.org for cloned dependency on omaha_query_params Review URL: https://codereview.chromium.org/693233003 Cr-Commit-Position: refs/heads/master@{#303055}
Diffstat (limited to 'extensions/shell/app')
-rw-r--r--extensions/shell/app/shell_main_delegate.cc11
-rw-r--r--extensions/shell/app/shell_main_delegate.h3
2 files changed, 14 insertions, 0 deletions
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc
index e452e48..d7aa5ab 100644
--- a/extensions/shell/app/shell_main_delegate.cc
+++ b/extensions/shell/app/shell_main_delegate.cc
@@ -15,6 +15,7 @@
#include "extensions/shell/browser/shell_content_browser_client.h"
#include "extensions/shell/common/shell_content_client.h"
#include "extensions/shell/renderer/shell_content_renderer_client.h"
+#include "extensions/shell/utility/shell_content_utility_client.h"
#include "ui/base/resource/resource_bundle.h"
#if defined(OS_CHROMEOS)
@@ -87,6 +88,11 @@ ShellMainDelegate::CreateContentRendererClient() {
return renderer_client_.get();
}
+content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
+ utility_client_.reset(CreateShellContentUtilityClient());
+ return utility_client_.get();
+}
+
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
void ShellMainDelegate::ZygoteStarting(
ScopedVector<content::ZygoteForkDelegate>* delegates) {
@@ -110,6 +116,11 @@ ShellMainDelegate::CreateShellContentRendererClient() {
return new ShellContentRendererClient();
}
+content::ContentUtilityClient*
+ShellMainDelegate::CreateShellContentUtilityClient() {
+ return new ShellContentUtilityClient();
+}
+
void ShellMainDelegate::InitializeResourceBundle() {
base::FilePath extensions_shell_and_test_pak_path;
PathService::Get(base::DIR_MODULE, &extensions_shell_and_test_pak_path);
diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h
index 11eba41..587de92 100644
--- a/extensions/shell/app/shell_main_delegate.h
+++ b/extensions/shell/app/shell_main_delegate.h
@@ -29,6 +29,7 @@ class ShellMainDelegate : public content::ContentMainDelegate {
void PreSandboxStartup() override;
content::ContentBrowserClient* CreateContentBrowserClient() override;
content::ContentRendererClient* CreateContentRendererClient() override;
+ content::ContentUtilityClient* CreateContentUtilityClient() override;
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
void ZygoteStarting(
ScopedVector<content::ZygoteForkDelegate>* delegates) override;
@@ -39,6 +40,7 @@ class ShellMainDelegate : public content::ContentMainDelegate {
virtual content::ContentClient* CreateContentClient();
virtual content::ContentBrowserClient* CreateShellContentBrowserClient();
virtual content::ContentRendererClient* CreateShellContentRendererClient();
+ virtual content::ContentUtilityClient* CreateShellContentUtilityClient();
// Initializes the resource bundle and resources.pak.
virtual void InitializeResourceBundle();
@@ -51,6 +53,7 @@ class ShellMainDelegate : public content::ContentMainDelegate {
scoped_ptr<content::ContentClient> content_client_;
scoped_ptr<content::ContentBrowserClient> browser_client_;
scoped_ptr<content::ContentRendererClient> renderer_client_;
+ scoped_ptr<content::ContentUtilityClient> utility_client_;
DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
};