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

Side by Side Diff: chrome/browser/chromeos/extensions/wallpaper_manager_util.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert Created 6 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 (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 "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
11 #include "chrome/browser/ui/extensions/app_launch_params.h"
12 #include "chrome/browser/ui/extensions/application_launch.h" 11 #include "chrome/browser/ui/extensions/application_launch.h"
13 #include "chrome/common/extensions/extension_constants.h" 12 #include "chrome/common/extensions/extension_constants.h"
14 #include "extensions/browser/extension_system.h" 13 #include "extensions/browser/extension_system.h"
15 #include "extensions/common/constants.h"
16 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
17 #include "ui/base/window_open_disposition.h" 15 #include "ui/base/window_open_disposition.h"
18 16
19 namespace wallpaper_manager_util { 17 namespace wallpaper_manager_util {
20 18
21 void OpenWallpaperManager() { 19 void OpenWallpaperManager() {
22 Profile* profile = ProfileManager::GetActiveUserProfile(); 20 Profile* profile = ProfileManager::GetActiveUserProfile();
23 DCHECK(profile); 21 DCHECK(profile);
24 22
25 ExtensionService* service = 23 ExtensionService* service =
26 extensions::ExtensionSystem::Get(profile)->extension_service(); 24 extensions::ExtensionSystem::Get(profile)->extension_service();
27 if (!service) 25 if (!service)
28 return; 26 return;
29 27
30 const extensions::Extension* extension = 28 const extensions::Extension* extension =
31 service->GetExtensionById(extension_misc::kWallpaperManagerId, false); 29 service->GetExtensionById(extension_misc::kWallpaperManagerId, false);
32 if (!extension) 30 if (!extension)
33 return; 31 return;
34 32
35 OpenApplication( 33 OpenApplication(AppLaunchParams(profile, extension,
36 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 34 extensions::LAUNCH_CONTAINER_WINDOW,
37 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); 35 NEW_WINDOW));
38 } 36 }
39 37
40 } // namespace wallpaper_manager_util 38 } // namespace wallpaper_manager_util
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/startup_app_launcher.cc ('k') | chrome/browser/chromeos/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698