Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2800)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

Issue 2894443002: arc: Set custom icon in shelf for ARC apps. (Closed)
Patch Set: cleanup Created 3 years, 7 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
Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
index 621c8ff12dd567d75715267744f55ce7de3ad6d7..02b0ec0e32f12033a9895173971a0fd02c968f74 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
@@ -22,6 +22,7 @@ namespace aura {
class Window;
}
+class ArcAppWindow;
class ArcAppWindowLauncherItemController;
class ChromeLauncherController;
@@ -72,9 +73,13 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
void OnTaskOrientationLockRequested(
int32_t task_id,
const arc::mojom::OrientationLock orientation_lock) override;
+ void OnTaskSetDescription(int32_t task_id,
msw 2017/05/18 18:26:59 nit: order to match interface decl
khmel 2017/05/18 20:27:51 Done.
+ const std::string& label,
+ const std::vector<uint8_t>& icon_png_data) override;
+
+ int active_task_id() const { return active_task_id_; }
private:
- class AppWindow;
class AppWindowInfo;
using TaskIdToAppWindowInfo = std::map<int, std::unique_ptr<AppWindowInfo>>;
@@ -91,7 +96,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
void UnregisterApp(AppWindowInfo* app_window_info);
AppWindowInfo* GetAppWindowInfoForTask(int task_id);
- AppWindow* GetAppWindowForTask(int task_id);
+ ArcAppWindow* GetAppWindowForTask(int task_id);
void AttachControllerToWindowIfNeeded(aura::Window* window);
void AttachControllerToWindowsIfNeeded();
@@ -99,7 +104,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
int taskId,
const AppWindowInfo& app_window_info);
- void SetOrientationLockForAppWindow(AppWindow* app_window);
+ void SetOrientationLockForAppWindow(ArcAppWindow* app_window);
std::vector<int> GetTaskIdsForApp(const std::string& arc_app_id) const;

Powered by Google App Engine
This is Rietveld 408576698