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

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

Issue 2577963006: Revert of Converts chrome to aura-mus (Closed)
Patch Set: 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"
11 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" 11 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
12 #include "extensions/grit/extensions_browser_resources.h" 12 #include "extensions/grit/extensions_browser_resources.h"
13 #include "mojo/common/common_type_converters.h" 13 #include "mojo/common/common_type_converters.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/events/event_constants.h"
16 15
17 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate { 16 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate {
18 public: 17 public:
19 explicit ChromeShelfItemDelegate(const std::string& app_id, 18 explicit ChromeShelfItemDelegate(const std::string& app_id,
20 ChromeLauncherController* controller) 19 ChromeLauncherController* controller)
21 : app_id_(app_id), 20 : app_id_(app_id),
22 item_delegate_binding_(this), 21 item_delegate_binding_(this),
23 controller_(controller) {} 22 controller_(controller) {}
24 ~ChromeShelfItemDelegate() override {} 23 ~ChromeShelfItemDelegate() override {}
25 24
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 app_id_to_item_delegate_.insert( 303 app_id_to_item_delegate_.insert(
305 std::make_pair(app_id, std::move(delegate))); 304 std::make_pair(app_id, std::move(delegate)));
306 305
307 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); 306 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
308 if (app_icon_loader) { 307 if (app_icon_loader) {
309 app_icon_loader->FetchImage(app_id); 308 app_icon_loader->FetchImage(app_id);
310 app_icon_loader->UpdateImage(app_id); 309 app_icon_loader->UpdateImage(app_id);
311 } 310 }
312 } 311 }
313 } 312 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698