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

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

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)
Patch Set: Fix kInvalidShelfID typo. 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/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 "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 10 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 NOTIMPLEMENTED(); 143 NOTIMPLEMENTED();
144 return extensions::LAUNCH_TYPE_INVALID; 144 return extensions::LAUNCH_TYPE_INVALID;
145 } 145 }
146 146
147 void ChromeLauncherControllerMus::SetLauncherItemImage( 147 void ChromeLauncherControllerMus::SetLauncherItemImage(
148 ash::ShelfID shelf_id, 148 ash::ShelfID shelf_id,
149 const gfx::ImageSkia& image) { 149 const gfx::ImageSkia& image) {
150 NOTIMPLEMENTED(); 150 NOTIMPLEMENTED();
151 } 151 }
152 152
153 bool ChromeLauncherControllerMus::IsWindowedAppInLauncher(
154 const std::string& app_id) {
155 NOTIMPLEMENTED();
156 return false;
157 }
158
159 void ChromeLauncherControllerMus::SetLaunchType( 153 void ChromeLauncherControllerMus::SetLaunchType(
160 ash::ShelfID id, 154 ash::ShelfID id,
161 extensions::LaunchType launch_type) { 155 extensions::LaunchType launch_type) {
162 NOTIMPLEMENTED(); 156 NOTIMPLEMENTED();
163 } 157 }
164 158
165 void ChromeLauncherControllerMus::UpdateAppState(content::WebContents* contents, 159 void ChromeLauncherControllerMus::UpdateAppState(content::WebContents* contents,
166 AppState app_state) { 160 AppState app_state) {
167 NOTIMPLEMENTED(); 161 NOTIMPLEMENTED();
168 } 162 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 app_id_to_item_delegate_.insert( 304 app_id_to_item_delegate_.insert(
311 std::make_pair(app_id, std::move(delegate))); 305 std::make_pair(app_id, std::move(delegate)));
312 306
313 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); 307 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
314 if (app_icon_loader) { 308 if (app_icon_loader) {
315 app_icon_loader->FetchImage(app_id); 309 app_icon_loader->FetchImage(app_id);
316 app_icon_loader->UpdateImage(app_id); 310 app_icon_loader->UpdateImage(app_id);
317 } 311 }
318 } 312 }
319 } 313 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698