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

Side by Side Diff: chrome/browser/ui/webui/policy_ui.cc

Issue 44083005: policy: Remove UserCloudPolicyManagerFactory's dependency on Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/webui/policy_ui.h" 5 #include "chrome/browser/ui/webui/policy_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 #include "chrome/browser/chromeos/login/user_manager.h" 51 #include "chrome/browser/chromeos/login/user_manager.h"
52 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 52 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
53 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 53 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
54 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 54 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
55 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 55 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
56 #else 56 #else
57 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" 57 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
58 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 58 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
59 #include "content/public/browser/web_contents.h"
59 #endif 60 #endif
60 61
61 #if !defined(OS_ANDROID) && !defined(OS_IOS) 62 #if !defined(OS_ANDROID) && !defined(OS_IOS)
62 #include "chrome/browser/extensions/extension_service.h" 63 #include "chrome/browser/extensions/extension_service.h"
63 #include "chrome/browser/extensions/extension_system.h" 64 #include "chrome/browser/extensions/extension_system.h"
64 #include "chrome/browser/policy/policy_domain_descriptor.h" 65 #include "chrome/browser/policy/policy_domain_descriptor.h"
65 #include "chrome/common/extensions/extension.h" 66 #include "chrome/common/extensions/extension.h"
66 #include "chrome/common/extensions/extension_set.h" 67 #include "chrome/common/extensions/extension_set.h"
67 #include "components/policy/core/common/schema.h" 68 #include "components/policy/core/common/schema.h"
68 #include "extensions/common/manifest.h" 69 #include "extensions/common/manifest.h"
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager = 482 policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager =
482 policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile( 483 policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
483 Profile::FromWebUI(web_ui())); 484 Profile::FromWebUI(web_ui()));
484 if (user_cloud_policy_manager) { 485 if (user_cloud_policy_manager) {
485 user_status_provider_.reset( 486 user_status_provider_.reset(
486 new UserPolicyStatusProvider(user_cloud_policy_manager->core())); 487 new UserPolicyStatusProvider(user_cloud_policy_manager->core()));
487 } 488 }
488 } 489 }
489 #else 490 #else
490 policy::UserCloudPolicyManager* user_cloud_policy_manager = 491 policy::UserCloudPolicyManager* user_cloud_policy_manager =
491 policy::UserCloudPolicyManagerFactory::GetForProfile( 492 policy::UserCloudPolicyManagerFactory::GetForBrowserContext(
492 Profile::FromWebUI(web_ui())); 493 web_ui()->GetWebContents()->GetBrowserContext());
493 if (user_cloud_policy_manager) { 494 if (user_cloud_policy_manager) {
494 user_status_provider_.reset( 495 user_status_provider_.reset(
495 new UserPolicyStatusProvider(user_cloud_policy_manager->core())); 496 new UserPolicyStatusProvider(user_cloud_policy_manager->core()));
496 } 497 }
497 #endif 498 #endif
498 499
499 if (!user_status_provider_.get()) 500 if (!user_status_provider_.get())
500 user_status_provider_.reset(new CloudPolicyStatusProvider()); 501 user_status_provider_.reset(new CloudPolicyStatusProvider());
501 if (!device_status_provider_.get()) 502 if (!device_status_provider_.get())
502 device_status_provider_.reset(new CloudPolicyStatusProvider()); 503 device_status_provider_.reset(new CloudPolicyStatusProvider());
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 } 720 }
720 721
721 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) { 722 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
722 web_ui->AddMessageHandler(new PolicyUIHandler); 723 web_ui->AddMessageHandler(new PolicyUIHandler);
723 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), 724 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
724 CreatePolicyUIHTMLSource()); 725 CreatePolicyUIHTMLSource());
725 } 726 }
726 727
727 PolicyUI::~PolicyUI() { 728 PolicyUI::~PolicyUI() {
728 } 729 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698