chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc - Issue 287123002: [WebModals] New API for browser-scoped popup management.

Side by Side Diff: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

Issue 287123002: [WebModals] New API for browser-scoped popup management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make PopupManager a thin API for WCMDM Created 6 years, 6 months 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/ui/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/ui/captive_portal_view.h"	7 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"

8 #include "chrome/browser/chromeos/login/ui/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"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 Close();	48 Close();

49 return;	49 return;

50 }	50 }

51	51

52 if (GetState() == STATE_DISPLAYED) // Dialog is already shown, do nothing.	52 if (GetState() == STATE_DISPLAYED) // Dialog is already shown, do nothing.

53 return;	53 return;

54	54

55 InitCaptivePortalView();	55 InitCaptivePortalView();

56	56

57 CaptivePortalView* captive_portal_view = captive_portal_view_.release();	57 CaptivePortalView* captive_portal_view = captive_portal_view_.release();

	58 // TODO(gbillock): Use PopupManager here.

58 WebContentsModalDialogManager* web_contents_modal_dialog_manager =	59 WebContentsModalDialogManager* web_contents_modal_dialog_manager =

59 WebContentsModalDialogManager::FromWebContents(web_contents_);	60 WebContentsModalDialogManager::FromWebContents(web_contents_);

60 DCHECK(web_contents_modal_dialog_manager);	61 DCHECK(web_contents_modal_dialog_manager);

61 WebContentsModalDialogManagerDelegate* delegate =	62 WebContentsModalDialogManagerDelegate* delegate =

62 web_contents_modal_dialog_manager->delegate();	63 web_contents_modal_dialog_manager->delegate();

63 DCHECK(delegate);	64 DCHECK(delegate);

64 widget_ = views::Widget::CreateWindowAsFramelessChild(	65 widget_ = views::Widget::CreateWindowAsFramelessChild(

65 captive_portal_view,	66 captive_portal_view,

66 delegate->GetWebContentsModalDialogHost()->GetHostView());	67 delegate->GetWebContentsModalDialogHost()->GetHostView());

67 captive_portal_view->Init();	68 captive_portal_view->Init();

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 }	134 }

134	135

135 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) {	136 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) {

136 if (!widget_ \|\| widget_ != widget)	137 if (!widget_ \|\| widget_ != widget)

137 return;	138 return;

138 widget_->RemoveObserver(this);	139 widget_->RemoveObserver(this);

139 widget_ = NULL;	140 widget_ = NULL;

140 }	141 }

141	142

142 } // namespace chromeos	143 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/attestation/platform_verification_dialog.cc ('k') | chrome/browser/ui/browser.h » ('j') | components/web_modal/popup_manager.h » ('J')