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

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

Issue 2790803002: mash: Remove V1 app shelf item locking; monitor running status instead. (Closed)
Patch Set: spelling Created 3 years, 8 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/chrome_launcher_controller_mus.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
6 6
7 #include "ash/public/cpp/app_launch_id.h" 7 #include "ash/public/cpp/app_launch_id.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 void ChromeLauncherControllerMus::CloseLauncherItem(ash::ShelfID id) { 52 void ChromeLauncherControllerMus::CloseLauncherItem(ash::ShelfID id) {
53 NOTIMPLEMENTED(); 53 NOTIMPLEMENTED();
54 } 54 }
55 55
56 bool ChromeLauncherControllerMus::IsPinned(ash::ShelfID id) { 56 bool ChromeLauncherControllerMus::IsPinned(ash::ShelfID id) {
57 NOTIMPLEMENTED(); 57 NOTIMPLEMENTED();
58 return false; 58 return false;
59 } 59 }
60 60
61 void ChromeLauncherControllerMus::LockV1AppWithID(const std::string& app_id) { 61 void ChromeLauncherControllerMus::SetV1AppStatus(const std::string& app_id,
62 ash::ShelfItemStatus status) {
62 NOTIMPLEMENTED(); 63 NOTIMPLEMENTED();
63 } 64 }
64 65
65 void ChromeLauncherControllerMus::UnlockV1AppWithID(const std::string& app_id) {
66 NOTIMPLEMENTED();
67 }
68
69 void ChromeLauncherControllerMus::Launch(ash::ShelfID id, int event_flags) { 66 void ChromeLauncherControllerMus::Launch(ash::ShelfID id, int event_flags) {
70 NOTIMPLEMENTED(); 67 NOTIMPLEMENTED();
71 } 68 }
72 69
73 void ChromeLauncherControllerMus::Close(ash::ShelfID id) { 70 void ChromeLauncherControllerMus::Close(ash::ShelfID id) {
74 NOTIMPLEMENTED(); 71 NOTIMPLEMENTED();
75 } 72 }
76 73
77 bool ChromeLauncherControllerMus::IsOpen(ash::ShelfID id) { 74 bool ChromeLauncherControllerMus::IsOpen(ash::ShelfID id) {
78 NOTIMPLEMENTED(); 75 NOTIMPLEMENTED();
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 item->image = *image.ToSkBitmap(); 234 item->image = *image.ToSkBitmap();
238 // TOOD(msw): Actually pin the item and install its delegate; this code is 235 // TOOD(msw): Actually pin the item and install its delegate; this code is
239 // unused at the moment. See http://crbug.com/647879 236 // unused at the moment. See http://crbug.com/647879
240 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); 237 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
241 if (app_icon_loader) { 238 if (app_icon_loader) {
242 app_icon_loader->FetchImage(app_id); 239 app_icon_loader->FetchImage(app_id);
243 app_icon_loader->UpdateImage(app_id); 240 app_icon_loader->UpdateImage(app_id);
244 } 241 }
245 } 242 }
246 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698