OLD | NEW |
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/chromeos/extensions/wallpaper_manager_util.h" | 5 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" |
10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
14 #include "chrome/browser/ui/chrome_pages.h" | 15 #include "chrome/browser/ui/chrome_pages.h" |
15 #include "chrome/browser/ui/extensions/application_launch.h" | 16 #include "chrome/browser/ui/extensions/application_launch.h" |
16 #include "chrome/browser/ui/host_desktop.h" | 17 #include "chrome/browser/ui/host_desktop.h" |
17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/extensions/extension_constants.h" | 19 #include "chrome/common/extensions/extension_constants.h" |
19 | 20 |
20 namespace wallpaper_manager_util { | 21 namespace wallpaper_manager_util { |
21 | 22 |
22 void OpenWallpaperManager() { | 23 void OpenWallpaperManager() { |
23 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); | 24 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
24 ExtensionService* service = profile->GetExtensionService(); | 25 ExtensionService* service = |
| 26 extensions::ExtensionSystem::Get(profile)->extension_service(); |
25 if (!service) | 27 if (!service) |
26 return; | 28 return; |
27 | 29 |
28 const extensions::Extension* extension = | 30 const extensions::Extension* extension = |
29 service->GetExtensionById(extension_misc::kWallpaperManagerId, false); | 31 service->GetExtensionById(extension_misc::kWallpaperManagerId, false); |
30 if (!extension) | 32 if (!extension) |
31 return; | 33 return; |
32 | 34 |
33 application_launch::LaunchParams params(profile, extension, | 35 application_launch::LaunchParams params(profile, extension, |
34 extension_misc::LAUNCH_WINDOW, | 36 extension_misc::LAUNCH_WINDOW, |
35 NEW_WINDOW); | 37 NEW_WINDOW); |
36 application_launch::OpenApplication(params); | 38 application_launch::OpenApplication(params); |
37 } | 39 } |
38 | 40 |
39 } // namespace wallpaper_manager_util | 41 } // namespace wallpaper_manager_util |
OLD | NEW |