chrome/browser/chromeos/first_run/drive_first_run_controller.cc - Issue 218683011: Remove ExtensionService::[Get|Is]InstalledApp()

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: chrome/browser/chromeos/first_run/drive_first_run_controller.cc

Issue 218683011: Remove ExtensionService::[Get|Is]InstalledApp() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ces_get_installed_ext_by_url

Patch Set: Latest master Created 6 years, 9 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 | « chrome/browser/autocomplete/extension_app_provider.cc ('k') | chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc » ('j') | chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/first_run/drive_first_run_controller.cc

diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc

index 2bbd9fc3e097cedbbb97c649415b6e619c393c06..e8c8f00f4523e015720446fc53584b6f16909dfa 100644

--- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc

+++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc

@@ -32,8 +32,10 @@

#include "content/public/browser/site_instance.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_observer.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

+#include "extensions/common/extension_set.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -297,10 +299,9 @@ bool DriveWebContentsManager::ShouldCreateWebContents(

return true;

// Check that the target URL is for the Drive app.

- ExtensionService* service =

- extensions::ExtensionSystem::Get(profile_)->extension_service();

- const extensions::Extension *extension =

- service->GetInstalledApp(target_url);

+ const extensions::Extension* extension =

+ extensions::ExtensionRegistry::Get(profile_)

+ ->enabled_extensions().GetAppByURL(target_url);

if (!extension || extension->id() != app_id_)

return true;