| 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/login/captive_portal_window_proxy.h" | 5 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/login/captive_portal_view.h" | 7 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h" |
| 8 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" | 8 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h" |
| 9 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 9 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 10 #include "components/web_modal/web_contents_modal_dialog_host.h" | 10 #include "components/web_modal/web_contents_modal_dialog_host.h" |
| 11 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 11 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 12 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" | 12 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" |
| 13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 14 | 14 |
| 15 using web_modal::WebContentsModalDialogManager; | 15 using web_modal::WebContentsModalDialogManager; |
| 16 using web_modal::WebContentsModalDialogManagerDelegate; | 16 using web_modal::WebContentsModalDialogManagerDelegate; |
| 17 | 17 |
| 18 namespace chromeos { | 18 namespace chromeos { |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 } | 133 } |
| 134 | 134 |
| 135 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) { | 135 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) { |
| 136 if (!widget_ || widget_ != widget) | 136 if (!widget_ || widget_ != widget) |
| 137 return; | 137 return; |
| 138 widget_->RemoveObserver(this); | 138 widget_->RemoveObserver(this); |
| 139 widget_ = NULL; | 139 widget_ = NULL; |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace chromeos | 142 } // namespace chromeos |
| OLD | NEW |