chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc - Issue 709813004: Remove the deprecated function ExtensionService::extensions().

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/ui/fullscreen/fullscreen_exit_bubble.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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/ui/cocoa/fullscreen_exit_bubble_controller.mm ('k') | chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc

diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc

index 18d1f115776d79a33b57110eb5ceafd4d52d688b..ffd5d0a2bb3a28a142c5ad4741b4e0a5bec2a208 100644

--- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc

+++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc

@@ -11,7 +11,7 @@

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"

#include "chrome/grit/generated_resources.h"

-#include "extensions/browser/extension_system.h"

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

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

#include "ui/gfx/rect.h"

#include "ui/strings/grit/ui_strings.h"

@@ -132,8 +132,7 @@ void FullscreenExitBubble::Cancel() {

base::string16 FullscreenExitBubble::GetCurrentMessageText() const {

return fullscreen_bubble::GetLabelTextForType(

bubble_type_, url_,

- extensions::ExtensionSystem::Get(

- browser_->profile())->extension_service());

+ extensions::ExtensionRegistry::Get(browser_->profile()));

}

base::string16 FullscreenExitBubble::GetCurrentDenyButtonText() const {