Add ability for Widgets to override the DefaultThemeProvider

chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

 // Copyright 2014 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/chromeos/login/ui/captive_portal_window_proxy.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"
 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // The captive portal dialog is system-modal, but uses the web-content-modal
 // dialog manager (odd) and requires this atypical dialog widget initialization.
 views::Widget* CreateWindowAsFramelessChild(views::WidgetDelegate* delegate,
                                             gfx::NativeView parent) {
   views::Widget* widget = new views::Widget;
 
   views::Widget::InitParams params;
   params.delegate = delegate;
   params.child = true;
   params.parent = parent;
   params.remove_standard_frame = true;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+  params.theme_provider = ThemeServiceFactory::GetForProfile(
+      ProfileManager::GetActiveUserProfile());

[oshima, 2015/09/02 18:44:12]

You should get the profile associated with the parent, instead of active one.

Please see MultiUserWindowManager::GetUserPresentingWindow, and ask skuhne@ if
you have a question about MultiUserWindowManager.

[jonross, 2015/09/09 14:54:36]

I have switched to using MultiUserWindowManager, however it is not always able
to provide a Profile. So I have fallbacks to ProfileManager for when that
occurs.

 
   widget->Init(params);
   return widget;
 }
 
 }  // namespace
 
 namespace chromeos {
 
 CaptivePortalWindowProxy::CaptivePortalWindowProxy(
@@ skipping 113 matching lines @@
 }
 
 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) {
   if (!widget_ || widget_ != widget)
     return;
   widget_->RemoveObserver(this);
   widget_ = NULL;
 }
 
 }  // namespace chromeos