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

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

Issue 2684723003: Remove LauncherItemController::Launch, cleanup. (Closed)
Patch Set: Use AppLauncherId Created 3 years, 10 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
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/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 10 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
11 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" 11 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
12 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" 12 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h" 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
15 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" 15 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/base/base_window.h" 17 #include "ui/base/base_window.h"
18 18
19 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController( 19 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
20 const std::string& arc_app_id, 20 const std::string& arc_app_id,
21 ChromeLauncherController* controller) 21 ChromeLauncherController* controller)
22 : AppWindowLauncherItemController(arc_app_id, "", controller) {} 22 : AppWindowLauncherItemController(arc_app_id, std::string(), controller) {}
23 23
24 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {} 24 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
25 25
26 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) { 26 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) {
27 task_ids_.insert(task_id); 27 task_ids_.insert(task_id);
28 } 28 }
29 29
30 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) { 30 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) {
31 task_ids_.erase(task_id); 31 task_ids_.erase(task_id);
32 } 32 }
(...skipping 26 matching lines...) Expand all
59 size_t i = std::distance(windows().begin(), it); 59 size_t i = std::distance(windows().begin(), it);
60 gfx::Image image; 60 gfx::Image image;
61 aura::Window* window = (*it)->GetNativeWindow(); 61 aura::Window* window = (*it)->GetNativeWindow();
62 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemV2App>( 62 items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemV2App>(
63 ((window && !window->GetTitle().empty()) ? window->GetTitle() 63 ((window && !window->GetTitle().empty()) ? window->GetTitle()
64 : app_title), 64 : app_title),
65 &image, app_id(), launcher_controller(), i)); 65 &image, app_id(), launcher_controller(), i));
66 } 66 }
67 return items; 67 return items;
68 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698