| 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/enrollment_dialog_view.h" | 5 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" |
| 8 #include "base/macros.h" | 9 #include "base/macros.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 11 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chrome/browser/ui/ash/system_tray_client.h" |
| 13 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 14 #include "chrome/browser/ui/browser_navigator.h" | 16 #include "chrome/browser/ui/browser_navigator.h" |
| 15 #include "chrome/browser/ui/browser_navigator_params.h" | 17 #include "chrome/browser/ui/browser_navigator_params.h" |
| 16 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
| 17 #include "chromeos/network/client_cert_util.h" | 19 #include "chromeos/network/client_cert_util.h" |
| 18 #include "chromeos/network/managed_network_configuration_handler.h" | 20 #include "chromeos/network/managed_network_configuration_handler.h" |
| 19 #include "chromeos/network/network_event_log.h" | 21 #include "chromeos/network/network_event_log.h" |
| 20 #include "chromeos/network/network_state.h" | 22 #include "chromeos/network/network_state.h" |
| 21 #include "chromeos/network/network_state_handler.h" | 23 #include "chromeos/network/network_state_handler.h" |
| 22 #include "extensions/browser/extension_host.h" | 24 #include "extensions/browser/extension_host.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 } | 98 } |
| 97 | 99 |
| 98 // static | 100 // static |
| 99 void EnrollmentDialogView::ShowDialog(gfx::NativeWindow owning_window, | 101 void EnrollmentDialogView::ShowDialog(gfx::NativeWindow owning_window, |
| 100 const std::string& network_name, | 102 const std::string& network_name, |
| 101 Profile* profile, | 103 Profile* profile, |
| 102 const GURL& target_uri, | 104 const GURL& target_uri, |
| 103 const base::Closure& connect) { | 105 const base::Closure& connect) { |
| 104 EnrollmentDialogView* dialog_view = | 106 EnrollmentDialogView* dialog_view = |
| 105 new EnrollmentDialogView(network_name, profile, target_uri, connect); | 107 new EnrollmentDialogView(network_name, profile, target_uri, connect); |
| 106 views::DialogDelegate::CreateDialogWidget(dialog_view, NULL, owning_window); | 108 if (owning_window) { |
| 109 views::DialogDelegate::CreateDialogWidget(dialog_view, nullptr, |
| 110 owning_window); |
| 111 } else { |
| 112 SystemTrayClient::CreateUnownedDialogWidget(dialog_view); |
| 113 } |
| 107 dialog_view->InitDialog(); | 114 dialog_view->InitDialog(); |
| 108 views::Widget* widget = dialog_view->GetWidget(); | 115 views::Widget* widget = dialog_view->GetWidget(); |
| 109 DCHECK(widget); | 116 DCHECK(widget); |
| 110 widget->Show(); | 117 widget->Show(); |
| 111 } | 118 } |
| 112 | 119 |
| 113 bool EnrollmentDialogView::Accept() { | 120 bool EnrollmentDialogView::Accept() { |
| 114 accepted_ = true; | 121 accepted_ = true; |
| 115 return true; | 122 return true; |
| 116 } | 123 } |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 302 |
| 296 DialogEnrollmentDelegate* enrollment = | 303 DialogEnrollmentDelegate* enrollment = |
| 297 new DialogEnrollmentDelegate(owning_window, network->name(), profile); | 304 new DialogEnrollmentDelegate(owning_window, network->name(), profile); |
| 298 return enrollment->Enroll(cert_config.pattern.enrollment_uri_list(), | 305 return enrollment->Enroll(cert_config.pattern.enrollment_uri_list(), |
| 299 base::Bind(&EnrollmentComplete, service_path)); | 306 base::Bind(&EnrollmentComplete, service_path)); |
| 300 } | 307 } |
| 301 | 308 |
| 302 } // namespace enrollment | 309 } // namespace enrollment |
| 303 | 310 |
| 304 } // namespace chromeos | 311 } // namespace chromeos |
| OLD | NEW |