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

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

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)
Patch Set: Fix ash_shell compile 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
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 "base/strings/string_util.h" 7 #include "base/strings/string_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/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 void ChromeLauncherControllerMus::ActiveUserChanged( 175 void ChromeLauncherControllerMus::ActiveUserChanged(
176 const std::string& user_email) { 176 const std::string& user_email) {
177 NOTIMPLEMENTED(); 177 NOTIMPLEMENTED();
178 } 178 }
179 179
180 void ChromeLauncherControllerMus::AdditionalUserAddedToSession( 180 void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
181 Profile* profile) { 181 Profile* profile) {
182 NOTIMPLEMENTED(); 182 NOTIMPLEMENTED();
183 } 183 }
184 184
185 ash::ShelfAppMenuItemList ChromeLauncherControllerMus::GetAppMenuItems( 185 ash::ShelfAppMenuItemList ChromeLauncherControllerMus::GetAppMenuItemsForTest(
186 const ash::ShelfItem& item, 186 const ash::ShelfItem& item) {
187 int event_flags) {
188 NOTIMPLEMENTED(); 187 NOTIMPLEMENTED();
189 return ash::ShelfAppMenuItemList(); 188 return ash::ShelfAppMenuItemList();
190 } 189 }
191 190
192 std::vector<content::WebContents*> 191 std::vector<content::WebContents*>
193 ChromeLauncherControllerMus::GetV1ApplicationsFromAppId( 192 ChromeLauncherControllerMus::GetV1ApplicationsFromAppId(
194 const std::string& app_id) { 193 const std::string& app_id) {
195 NOTIMPLEMENTED(); 194 NOTIMPLEMENTED();
196 return std::vector<content::WebContents*>(); 195 return std::vector<content::WebContents*>();
197 } 196 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 app_id_to_item_delegate_.insert( 296 app_id_to_item_delegate_.insert(
298 std::make_pair(app_id, std::move(delegate))); 297 std::make_pair(app_id, std::move(delegate)));
299 298
300 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); 299 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
301 if (app_icon_loader) { 300 if (app_icon_loader) {
302 app_icon_loader->FetchImage(app_id); 301 app_icon_loader->FetchImage(app_id);
303 app_icon_loader->UpdateImage(app_id); 302 app_icon_loader->UpdateImage(app_id);
304 } 303 }
305 } 304 }
306 } 305 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698