Enable WebContents elevation for managed users.

chrome/browser/extensions/extension_uninstall_dialog.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/extension_resource.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"

[Bernhard Bauer, 2013/03/27 15:48:14]

Include this unconditionally.

[Adrian Kuegel, 2013/03/27 16:17:43]

Done.

 #endif
 
 namespace {
 
 // Returns pixel size under maximal scale factor for the icon whose device
 // independent size is |size_in_dip|
 int GetSizeForMaxScaleFactor(int size_in_dip) {
   ui::ScaleFactor max_scale_factor = ui::GetMaxScaleFactor();
   float max_scale_factor_scale = ui::GetScaleFactorScale(max_scale_factor);
 
@@ skipping 105 matching lines @@
   if (state_ == kImageIsLoading) {
     state_ = kBrowserIsClosing;
     delegate_->ExtensionUninstallCanceled();
   }
 }
 
 #if defined(ENABLE_MANAGED_USERS)
 bool ExtensionUninstallDialog::ShowAuthorizationDialog() {
   ManagedUserService* service =
       ManagedUserServiceFactory::GetForProfile(profile_);
-  if (service->ProfileIsManaged() && !service->CanSkipPassphraseDialog()) {
-    service->RequestAuthorizationUsingActiveWebContents(
-        browser_,
+  content::WebContents* web_contents =
+      browser_->tab_strip_model()->GetActiveWebContents();
+  if (service->ProfileIsManaged() &&
+      !service->CanSkipPassphraseDialog(web_contents)) {
+    service->RequestAuthorization(
+        web_contents,
         base::Bind(&ExtensionUninstallDialog::OnAuthorizationResult,
                    base::Unretained(this)));
     return true;
   }
+  service->AddElevationForExtension(extension_->id());
   return false;
 }
 
 void ExtensionUninstallDialog::OnAuthorizationResult(bool success) {
   if (success) {
     ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
         profile_);
     DCHECK(service);
     service->AddElevationForExtension(extension_->id());
     delegate_->ExtensionUninstallAccepted();
   } else {
     delegate_->ExtensionUninstallCanceled();
   }
 }
 #endif