chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2765563002: Move and rename Chrome's AppLauncherId to ash::AppLaunchId.

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_impl_unittest.cc

Issue 2765563002: Move and rename Chrome's AppLauncherId to ash::AppLaunchId. (Closed)

Patch Set: Add example commment. Created 3 years, 9 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/chrome_launcher_controller_impl_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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_impl_unittest.cc

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

index 1af52045db1c66ef2cf443f43a0e6fb3658d8a3c..6d485f5d00597645f0d8d7b0f0ac2e5eb21bd1d7 100644

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

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

@@ -22,6 +22,7 @@

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

+#include "ash/public/cpp/app_launch_id.h"

#include "ash/public/cpp/shelf_item.h"

#include "ash/shell.h"

#include "ash/test/ash_test_helper.h"

@@ -54,7 +55,6 @@

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

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

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

-#include "chrome/browser/ui/ash/app_launcher_id.h"

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

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

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

@@ -446,7 +446,7 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {

DCHECK(!test_controller_);

ash::ShelfID id =

launcher_controller_->CreateAppShortcutLauncherItemWithType(

- ash::AppLauncherId(app_id), model_->item_count(), ash::TYPE_APP);

+ ash::AppLaunchId(app_id), model_->item_count(), ash::TYPE_APP);

DCHECK(id);

// Change the created launcher controller into a V2 app controller.

test_controller_ = new TestV2AppLauncherItemController(app_id,