chrome/browser/chromeos/login/webui_login_view.cc - Issue 11644059: Change infobar creation to use a public static Create() method on the infobar delegate classes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 11644059: Change infobar creation to use a public static Create() method on the infobar delegate classes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_quota_permission_context.cc ('k') | chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/webui_login_view.cc

===================================================================

--- chrome/browser/chromeos/login/webui_login_view.cc (revision 175396)

+++ chrome/browser/chromeos/login/webui_login_view.cc (working copy)

@@ -17,11 +17,11 @@

#include "chrome/browser/chromeos/login/base_login_display_host.h"

#include "chrome/browser/chromeos/login/proxy_settings_dialog.h"

#include "chrome/browser/chromeos/login/webui_login_display.h"

-#include "chrome/browser/media/media_stream_devices_controller.h"

#include "chrome/browser/password_manager/password_manager.h"

#include "chrome/browser/password_manager/password_manager_delegate_impl.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/renderer_preferences_util.h"

+#include "chrome/browser/ui/media_stream_infobar_delegate.h"

#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/chrome_notification_types.h"

@@ -350,12 +350,7 @@

WebContents* web_contents,

const content::MediaStreamRequest& request,

const content::MediaResponseCallback& callback) {

- Profile* profile =

- Profile::FromBrowserContext(web_contents->GetBrowserContext());

- scoped_ptr<MediaStreamDevicesController> controller(

- new MediaStreamDevicesController(profile, request, callback));

- if (!controller->DismissInfoBarAndTakeActionOnSettings())

+ if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback))

NOTREACHED() << "Media stream not allowed for WebUI";

}