chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp. (Closed)

Patch Set: Comment on AppList item init. Created 3 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/extensions/bookmark_app_helper.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "ash/shelf/shelf_model.h"	7 #include "ash/public/cpp/shelf_model.h"

8 #include "base/memory/ptr_util.h"	8 #include "base/memory/ptr_util.h"

9 #include "base/threading/thread_task_runner_handle.h"	9 #include "base/threading/thread_task_runner_handle.h"

10 #include "chrome/browser/chromeos/arc/arc_util.h"	10 #include "chrome/browser/chromeos/arc/arc_util.h"

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

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

13 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controll er.h"	13 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controll er.h"

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

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

16 #include "ui/gfx/canvas.h"	16 #include "ui/gfx/canvas.h"

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

(...skipping 195 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
213 owner_->shelf_model()->SetShelfItemDelegate(shelf_id,	213 owner_->shelf_model()->SetShelfItemDelegate(shelf_id,

214 std::move(controller));	214 std::move(controller));

215 owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);	215 owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);

216 }	216 }

217	217

218 if (app_controller_map_.empty())	218 if (app_controller_map_.empty())

219 RegisterNextUpdate();	219 RegisterNextUpdate();

220	220

221 app_controller_map_[app_id] = item_controller;	221 app_controller_map_[app_id] = item_controller;

222 }	222 }

OLD	NEW