apps/app_shim/app_shim_host_manager_mac.mm - Issue 15269003: Refactor extension handling code from AppShimHost into ExtensionAppShimHandler.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: apps/app_shim/app_shim_host_manager_mac.mm

Issue 15269003: Refactor extension handling code from AppShimHost into ExtensionAppShimHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change to map of Hosts (no ObserverList). Improve test. Created 7 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

« apps/app_shim/app_shim_host_manager_mac.h ('K') | « apps/app_shim/app_shim_host_manager_mac.h ('k') | apps/app_shim/extension_app_shim_handler_mac.h » ('j') | apps/app_shim/extension_app_shim_handler_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: apps/app_shim/app_shim_host_manager_mac.mm

diff --git a/apps/app_shim/app_shim_host_manager_mac.mm b/apps/app_shim/app_shim_host_manager_mac.mm

index 6133b9be38e253ddc0897d12a193e816e3452000..049ba5b4fea07c95f2aa1be57c92da73f51bd18c 100644

--- a/apps/app_shim/app_shim_host_manager_mac.mm

+++ b/apps/app_shim/app_shim_host_manager_mac.mm

@@ -4,6 +4,7 @@

#include "apps/app_shim/app_shim_host_manager_mac.h"

+#include "apps/app_shim/app_shim_handler_mac.h"

#include "apps/app_shim/app_shim_host_mac.h"

#include "base/bind.h"

#include "base/files/file_path.h"

@@ -27,6 +28,7 @@ void CreateAppShimHost(const IPC::ChannelHandle& handle) {

AppShimHostManager::AppShimHostManager() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ apps::AppShimHandler::SetDefaultHandler(&extension_app_shim_handler_);

BrowserThread::PostTask(

BrowserThread::FILE, FROM_HERE,

base::Bind(&AppShimHostManager::InitOnFileThread,

@@ -34,6 +36,7 @@ AppShimHostManager::AppShimHostManager() {

}

AppShimHostManager::~AppShimHostManager() {

+ apps::AppShimHandler::SetDefaultHandler(NULL);

}

void AppShimHostManager::InitOnFileThread() {