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

Side by Side Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 1130353010: Remove deprecated ExtensionService::GetInstalledExtension() usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed if to iff Created 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/app_list/extension_app_item.h" 5 #include "chrome/browser/ui/app_list/extension_app_item.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_util.h" 8 #include "chrome/browser/extensions/extension_util.h"
10 #include "chrome/browser/extensions/launch_util.h" 9 #include "chrome/browser/extensions/launch_util.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/app_list/app_context_menu.h" 11 #include "chrome/browser/ui/app_list/app_context_menu.h"
13 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 12 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
14 #include "chrome/browser/ui/app_list/app_list_service.h" 13 #include "chrome/browser/ui/app_list/app_list_service.h"
15 #include "chrome/browser/ui/extensions/extension_enable_flow.h" 14 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
16 #include "chrome/browser/ui/host_desktop.h" 15 #include "chrome/browser/ui/host_desktop.h"
17 #include "chrome/common/extensions/extension_constants.h" 16 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/extensions/extension_metrics.h" 17 #include "chrome/common/extensions/extension_metrics.h"
19 #include "content/public/browser/user_metrics.h" 18 #include "content/public/browser/user_metrics.h"
20 #include "extensions/browser/app_sorting.h" 19 #include "extensions/browser/app_sorting.h"
21 #include "extensions/browser/extension_prefs.h" 20 #include "extensions/browser/extension_prefs.h"
22 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_registry.h"
23 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
24 #include "extensions/common/extension_icon_set.h" 23 #include "extensions/common/extension_icon_set.h"
25 #include "extensions/common/manifest_handlers/icons_handler.h" 24 #include "extensions/common/manifest_handlers/icons_handler.h"
26 #include "extensions/common/manifest_url_handlers.h" 25 #include "extensions/common/manifest_url_handlers.h"
27 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
28 #include "sync/api/string_ordinal.h" 27 #include "sync/api/string_ordinal.h"
29 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
31 #include "ui/gfx/color_utils.h" 30 #include "ui/gfx/color_utils.h"
32 #include "ui/gfx/geometry/rect.h" 31 #include "ui/gfx/geometry/rect.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 if (page.Equals(sorting->GetPageOrdinal(next->extension_id()))) 221 if (page.Equals(sorting->GetPageOrdinal(next->extension_id())))
223 next_id = next->extension_id(); 222 next_id = next->extension_id();
224 } 223 }
225 prefs->SetAppDraggedByUser(extension_id_); 224 prefs->SetAppDraggedByUser(extension_id_);
226 sorting->SetPageOrdinal(extension_id_, page); 225 sorting->SetPageOrdinal(extension_id_, page);
227 sorting->OnExtensionMoved(extension_id_, prev_id, next_id); 226 sorting->OnExtensionMoved(extension_id_, prev_id, next_id);
228 UpdatePositionFromExtensionOrdering(); 227 UpdatePositionFromExtensionOrdering();
229 } 228 }
230 229
231 const Extension* ExtensionAppItem::GetExtension() const { 230 const Extension* ExtensionAppItem::GetExtension() const {
232 const ExtensionService* service = 231 const extensions::ExtensionRegistry* registry =
233 extensions::ExtensionSystem::Get(profile_)->extension_service(); 232 extensions::ExtensionRegistry::Get(profile_);
234 const Extension* extension = service->GetInstalledExtension(extension_id_); 233 const Extension* extension = registry->GetInstalledExtension(
234 extension_id_);
235 return extension; 235 return extension;
236 } 236 }
237 237
238 void ExtensionAppItem::LoadImage(const Extension* extension) { 238 void ExtensionAppItem::LoadImage(const Extension* extension) {
239 icon_.reset(new extensions::IconImage( 239 icon_.reset(new extensions::IconImage(
240 profile_, 240 profile_,
241 extension, 241 extension,
242 extensions::IconsInfo::GetIcons(extension), 242 extensions::IconsInfo::GetIcons(extension),
243 extension_misc::EXTENSION_ICON_MEDIUM, 243 extension_misc::EXTENSION_ICON_MEDIUM,
244 extensions::util::GetDefaultAppIcon(), 244 extensions::util::GetDefaultAppIcon(),
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 const syncer::StringOrdinal& launch = 354 const syncer::StringOrdinal& launch =
355 GetAppSorting(profile_)->GetAppLaunchOrdinal(extension_id_); 355 GetAppSorting(profile_)->GetAppLaunchOrdinal(extension_id_);
356 set_position(syncer::StringOrdinal( 356 set_position(syncer::StringOrdinal(
357 page.ToInternalValue() + launch.ToInternalValue())); 357 page.ToInternalValue() + launch.ToInternalValue()));
358 } 358 }
359 359
360 AppListControllerDelegate* ExtensionAppItem::GetController() { 360 AppListControllerDelegate* ExtensionAppItem::GetController() {
361 return AppListService::Get(chrome::GetActiveDesktop())-> 361 return AppListService::Get(chrome::GetActiveDesktop())->
362 GetControllerDelegate(); 362 GetControllerDelegate();
363 } 363 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698