Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Side by Side Diff: chrome/browser/media/media_stream_infobar_delegate.cc

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + comments Created 6 years, 8 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
OLDNEW
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/media/media_stream_infobar_delegate.h" 5 #include "chrome/browser/media/media_stream_infobar_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/google/google_util.h" 10 #include "chrome/browser/google/google_util.h"
11 #include "chrome/browser/infobars/infobar.h" 11 #include "chrome/browser/infobars/infobar.h"
12 #include "chrome/browser/infobars/infobar_manager.h"
12 #include "chrome/browser/infobars/infobar_service.h" 13 #include "chrome/browser/infobars/infobar_service.h"
13 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
16 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace { 21 namespace {
21 22
(...skipping 25 matching lines...) Expand all
47 if (!infobar_service) { 48 if (!infobar_service) {
48 // Deny the request if there is no place to show the infobar, e.g. when 49 // Deny the request if there is no place to show the infobar, e.g. when
49 // the request comes from a background extension page. 50 // the request comes from a background extension page.
50 controller->Deny(false, content::MEDIA_DEVICE_INVALID_STATE); 51 controller->Deny(false, content::MEDIA_DEVICE_INVALID_STATE);
51 return false; 52 return false;
52 } 53 }
53 54
54 scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar( 55 scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
55 scoped_ptr<ConfirmInfoBarDelegate>( 56 scoped_ptr<ConfirmInfoBarDelegate>(
56 new MediaStreamInfoBarDelegate(controller.Pass())))); 57 new MediaStreamInfoBarDelegate(controller.Pass()))));
57 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { 58 InfoBarManager* infobar_manager = infobar_service->infobar_manager();
58 InfoBar* old_infobar = infobar_service->infobar_at(i); 59 for (size_t i = 0; i < infobar_manager->infobar_count(); ++i) {
60 InfoBar* old_infobar = infobar_manager->infobar_at(i);
59 if (old_infobar->delegate()->AsMediaStreamInfoBarDelegate()) { 61 if (old_infobar->delegate()->AsMediaStreamInfoBarDelegate()) {
60 infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass()); 62 infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
61 return true; 63 return true;
62 } 64 }
63 } 65 }
64 infobar_service->AddInfoBar(infobar.Pass()); 66 infobar_service->AddInfoBar(infobar.Pass());
65 return true; 67 return true;
66 } 68 }
67 69
68 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate( 70 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 web_contents()->OpenURL(content::OpenURLParams( 142 web_contents()->OpenURL(content::OpenURLParams(
141 google_util::AppendGoogleLocaleParam( 143 google_util::AppendGoogleLocaleParam(
142 GURL(chrome::kMediaAccessLearnMoreUrl)), 144 GURL(chrome::kMediaAccessLearnMoreUrl)),
143 content::Referrer(), 145 content::Referrer(),
144 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 146 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
145 content::PAGE_TRANSITION_LINK, 147 content::PAGE_TRANSITION_LINK,
146 false)); 148 false));
147 149
148 return false; // Do not dismiss the info bar. 150 return false; // Do not dismiss the info bar.
149 } 151 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_media_stream_infobar_browsertest.cc ('k') | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698