chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass.

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/arc_app_deferred_launcher_controller.cc

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)

Patch Set: Address comments. Created 3 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/arc_app_deferred_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

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

index ec8abca5a2bfbb3cd9a8996505cee96bc9efc0a1..6ddf01caaa7e09890b0b37ceded698efc59c76f0 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

@@ -12,7 +12,7 @@

#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"

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

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

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

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/canvas_image_source.h"

#include "ui/gfx/image/image_skia_operations.h"

@@ -60,7 +60,7 @@ class SpinningEffectSource : public gfx::CanvasImageSource {

} // namespace

ArcAppDeferredLauncherController::ArcAppDeferredLauncherController(

- ChromeLauncherControllerImpl* owner)

+ ChromeLauncherController* owner)

: owner_(owner), weak_ptr_factory_(this) {

if (arc::IsArcAllowedForProfile(owner->profile())) {

observed_profile_ = owner->profile();