chrome/browser/ui/extensions/extension_install_ui_default.cc - Issue 12207104: Refactor app_list_util.h into AppListService abstract base.

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/extensions/extension_install_ui_default.cc

Issue 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase for r184604=r184636 Created 7 years, 10 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/ui/cocoa/app_list/app_list_controller_cocoa.mm ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/extension_install_ui_default.cc

diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc

index b9290472999956abc3e223b191d50e420836e72f..8085c14b0dad736903199262f68411a6087a58d4 100644

--- a/chrome/browser/ui/extensions/extension_install_ui_default.cc

+++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc

@@ -15,7 +15,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

-#include "chrome/browser/ui/app_list/app_list_util.h"

+#include "chrome/browser/ui/app_list/app_list_service.h"

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

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

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

@@ -108,9 +108,8 @@ void OnAppLauncherEnabledCompleted(const extensions::Extension* extension,

SkBitmap* icon,

bool use_bubble,

bool use_launcher) {

-#if defined(ENABLE_APP_LIST)

if (use_launcher) {

- chrome::ShowAppList(browser->profile());

+ AppListService::Get()->ShowAppList(browser->profile());

content::NotificationService::current()->Notify(

chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,

@@ -118,7 +117,6 @@ void OnAppLauncherEnabledCompleted(const extensions::Extension* extension,

content::Details<const std::string>(&extension->id()));

return;

}

-#endif

if (use_bubble) {

chrome::ShowExtensionInstalledBubble(extension, browser, *icon);

@@ -228,7 +226,7 @@ ExtensionInstallUI* ExtensionInstallUI::Create(Profile* profile) {

void ExtensionInstallUI::OpenAppInstalledUI(Browser* browser,

const std::string& app_id) {

#if defined(OS_CHROMEOS)

- chrome::ShowAppList(browser->profile());

+ AppListService::Get()->ShowAppList(browser->profile());

content::NotificationService::current()->Notify(

chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,