OLD | NEW |
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 "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
10 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 11 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
11 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" | 12 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" |
12 #include "extensions/grit/extensions_browser_resources.h" | 13 #include "extensions/grit/extensions_browser_resources.h" |
13 #include "mojo/common/common_type_converters.h" | 14 #include "mojo/common/common_type_converters.h" |
14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
15 #include "ui/events/event_constants.h" | 16 #include "ui/events/event_constants.h" |
16 | 17 |
17 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate { | 18 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate { |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 ash::launcher::GetPinnedAppsFromPrefs(profile()->GetPrefs(), | 285 ash::launcher::GetPinnedAppsFromPrefs(profile()->GetPrefs(), |
285 launcher_controller_helper()); | 286 launcher_controller_helper()); |
286 | 287 |
287 for (const auto& app_launcher_id : pinned_apps) { | 288 for (const auto& app_launcher_id : pinned_apps) { |
288 const std::string app_id = app_launcher_id.app_id(); | 289 const std::string app_id = app_launcher_id.app_id(); |
289 if (app_launcher_id.ToString() == ash::launcher::kPinnedAppsPlaceholder) | 290 if (app_launcher_id.ToString() == ash::launcher::kPinnedAppsPlaceholder) |
290 continue; | 291 continue; |
291 | 292 |
292 ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New()); | 293 ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New()); |
293 item->app_id = app_id; | 294 item->app_id = app_id; |
294 item->app_title = mojo::String::From( | 295 item->app_title = base::UTF16ToUTF8( |
295 launcher_controller_helper()->GetAppTitle(profile(), app_id)); | 296 launcher_controller_helper()->GetAppTitle(profile(), app_id)); |
296 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 297 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
297 const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON); | 298 const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON); |
298 item->image = *image.ToSkBitmap(); | 299 item->image = *image.ToSkBitmap(); |
299 std::unique_ptr<ChromeShelfItemDelegate> delegate( | 300 std::unique_ptr<ChromeShelfItemDelegate> delegate( |
300 new ChromeShelfItemDelegate(app_id, this)); | 301 new ChromeShelfItemDelegate(app_id, this)); |
301 shelf_controller()->PinItem(std::move(item), | 302 shelf_controller()->PinItem(std::move(item), |
302 delegate->CreateInterfacePtrInfoAndBind( | 303 delegate->CreateInterfacePtrInfoAndBind( |
303 shelf_controller().associated_group())); | 304 shelf_controller().associated_group())); |
304 app_id_to_item_delegate_.insert( | 305 app_id_to_item_delegate_.insert( |
305 std::make_pair(app_id, std::move(delegate))); | 306 std::make_pair(app_id, std::move(delegate))); |
306 | 307 |
307 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); | 308 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); |
308 if (app_icon_loader) { | 309 if (app_icon_loader) { |
309 app_icon_loader->FetchImage(app_id); | 310 app_icon_loader->FetchImage(app_id); |
310 app_icon_loader->UpdateImage(app_id); | 311 app_icon_loader->UpdateImage(app_id); |
311 } | 312 } |
312 } | 313 } |
313 } | 314 } |
OLD | NEW |