chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm - 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/cocoa/fullscreen_exit_bubble_controller.mm

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

Patch Set: Fix Chrome OS compile failure. 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

« chrome/browser/ui/app_list/app_list_test_util.cc ('K') | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc » ('j') | chrome/browser/ui/webui/policy_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

index 0b52383a314b3019b8703bb7b3bcdd6dd336a230..a576002dba7f12f1fe01a3398c937f4348ff1021 100644

--- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

@@ -20,7 +20,7 @@

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

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

#include "chrome/grit/generated_resources.h"

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

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

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"

#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

@@ -258,10 +258,10 @@ const float kHideDuration = 0.7;

- (NSString*)getLabelText {

if (bubbleType_ == FEB_TYPE_NONE)

return @"";

- ExtensionService* extension_service = extensions::ExtensionSystem::Get(

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

- return SysUTF16ToNSString(fullscreen_bubble::GetLabelTextForType(

- bubbleType_, url_, extension_service));

+ extensions::ExtensionRegistry* registry =

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

+ return SysUTF16ToNSString(

+ fullscreen_bubble::GetLabelTextForType(bubbleType_, url_, registry));

}

// This looks at the Main Menu and determines what the user has set as the