chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - Issue 1919593003: arc: Prevent showing Opt-in UI when it is not expected.

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/launcher/chrome_launcher_controller.h

Issue 1919593003: arc: Prevent showing Opt-in UI when it is not expected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: refactore to use GetPinnable Created 4 years, 8 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/launcher/app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

index 3dcfad209381d3bf107ba0a4f9d117c120ac5267..59a5be7b5e9115dcb8a869596c6b843b5fad90b3 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

@@ -23,6 +23,7 @@

#include "base/memory/scoped_vector.h"

#include "build/build_config.h"

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

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

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

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

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

@@ -381,7 +382,7 @@ class ChromeLauncherController

return app_window_controllers_[0].get();

}

- bool CanPin(const std::string& app_id);

+ AppListControllerDelegate::Pinnable GetPinnable(const std::string& app_id);

xiyuan 2016/04/26 21:00:23 nit: We might want find a better home for Pinnable

khmel 2016/04/26 21:11:31 Right, it looks a little odd to have it here.

protected:

// Creates a new app shortcut item and controller on the shelf at |index|.