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

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

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)
Patch Set: Rebase; remove new LauncherItemController::TYPE_APP check. Created 4 years 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
OLDNEW
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_window_launcher_item_controller .h" 5 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller .h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
10 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" 10 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
11 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" 11 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h" 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
14 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 14 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/base/base_window.h" 16 #include "ui/base/base_window.h"
17 17
18 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController( 18 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
19 const std::string& arc_app_id, 19 const std::string& arc_app_id,
20 ChromeLauncherController* controller) 20 ChromeLauncherController* controller)
21 : AppWindowLauncherItemController(TYPE_APP, arc_app_id, "", controller) {} 21 : AppWindowLauncherItemController(arc_app_id, "", controller) {}
22 22
23 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {} 23 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
24 24
25 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) { 25 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) {
26 task_ids_.insert(task_id); 26 task_ids_.insert(task_id);
27 } 27 }
28 28
29 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) { 29 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) {
30 task_ids_.erase(task_id); 30 task_ids_.erase(task_id);
31 } 31 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 gfx::Image image; 77 gfx::Image image;
78 aura::Window* window = (*it)->GetNativeWindow(); 78 aura::Window* window = (*it)->GetNativeWindow();
79 items.push_back(new ChromeLauncherAppMenuItemV2App( 79 items.push_back(new ChromeLauncherAppMenuItemV2App(
80 ((window && !window->GetTitle().empty()) ? window->GetTitle() 80 ((window && !window->GetTitle().empty()) ? window->GetTitle()
81 : GetTitle()), 81 : GetTitle()),
82 &image, app_id(), launcher_controller(), i, 82 &image, app_id(), launcher_controller(), i,
83 i == 0 /* has_leading_separator */)); 83 i == 0 /* has_leading_separator */));
84 } 84 }
85 return items; 85 return items;
86 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698