chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits.

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

Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)

Patch Set: Address comment. 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_status_monitor.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

7	7

8 #include <memory>	8 #include <memory>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "ash/common/shelf/shelf_item_types.h"	12 #include "ash/public/cpp/shelf_item.h"

13 #include "ash/public/interfaces/shelf.mojom.h"	13 #include "ash/public/interfaces/shelf.mojom.h"

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

15 #include "chrome/browser/ui/app_icon_loader_delegate.h"	15 #include "chrome/browser/ui/app_icon_loader_delegate.h"

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

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

18 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"	18 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"

19 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"	19 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"

20 #include "mojo/public/cpp/bindings/associated_binding.h"	20 #include "mojo/public/cpp/bindings/associated_binding.h"

21	21

22 class AccountId;	22 class AccountId;

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
304 // An observer that manages the shelf title and icon for settings windows.	304 // An observer that manages the shelf title and icon for settings windows.

305 SettingsWindowObserver settings_window_observer_;	305 SettingsWindowObserver settings_window_observer_;

306	306

307 // Used to load the images for app items.	307 // Used to load the images for app items.

308 std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;	308 std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;

309	309

310 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);	310 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);

311 };	311 };

312	312

313 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	313 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

OLD	NEW