chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 2052013002: Adding ChromeLauncherController interface.

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/ash/chrome_shell_delegate.cc

Issue 2052013002: Adding ChromeLauncherController interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome_launcher_smaller_api

Patch Set: Rebase Created 4 years, 6 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/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc

index c6447f20b9a4e6f73f2d07c82c9fee90d4e38d59..78ecd6b9f6416d4270ef0ee96d567ea44884760c 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -44,7 +44,7 @@

#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"

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

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

-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"

#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

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

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

@@ -422,7 +422,8 @@ app_list::AppListPresenter* ChromeShellDelegate::GetAppListPresenter() {

ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(

ash::ShelfModel* model) {

if (!shelf_delegate_) {

- shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);

+ shelf_delegate_ =

+ ChromeLauncherControllerImpl::CreateInstance(nullptr, model);

shelf_delegate_->Init();

}

return shelf_delegate_;