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

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_switches.h" 11 #include "ash/ash_switches.h"
12 #include "ash/common/shelf/shelf_item_delegate_manager.h"
13 #include "ash/common/shelf/shelf_model.h"
12 #include "ash/desktop_background/desktop_background_controller.h" 14 #include "ash/desktop_background/desktop_background_controller.h"
13 #include "ash/multi_profile_uma.h" 15 #include "ash/multi_profile_uma.h"
14 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
15 #include "ash/shelf/shelf.h" 17 #include "ash/shelf/shelf.h"
16 #include "ash/shelf/shelf_item_delegate_manager.h"
17 #include "ash/shelf/shelf_model.h"
18 #include "ash/shell.h" 18 #include "ash/shell.h"
19 #include "ash/system/tray/system_tray_delegate.h" 19 #include "ash/system/tray/system_tray_delegate.h"
20 #include "ash/wm/window_util.h" 20 #include "ash/wm/window_util.h"
21 #include "base/command_line.h" 21 #include "base/command_line.h"
22 #include "base/macros.h" 22 #include "base/macros.h"
23 #include "base/strings/pattern.h" 23 #include "base/strings/pattern.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/strings/utf_string_conversions.h" 25 #include "base/strings/utf_string_conversions.h"
26 #include "base/values.h" 26 #include "base/values.h"
27 #include "build/build_config.h" 27 #include "build/build_config.h"
(...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 1909
1910 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp( 1910 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp(
1911 const std::string& app_id) { 1911 const std::string& app_id) {
1912 for (const auto& app_icon_loader : app_icon_loaders_) { 1912 for (const auto& app_icon_loader : app_icon_loaders_) {
1913 if (app_icon_loader->CanLoadImageForApp(app_id)) 1913 if (app_icon_loader->CanLoadImageForApp(app_id))
1914 return app_icon_loader.get(); 1914 return app_icon_loader.get();
1915 } 1915 }
1916 1916
1917 return nullptr; 1917 return nullptr;
1918 } 1918 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698