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

Side by Side Diff: chrome/browser/infobars/insecure_content_infobar_delegate.cc

Issue 10830353: Introduce InfoBarTabService API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments, merge to LKGR Created 8 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/infobars/insecure_content_infobar_delegate.h" 5 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/browser/google/google_util.h" 8 #include "chrome/browser/google/google_util.h"
9 #include "chrome/browser/infobars/infobar_tab_helper.h" 9 #include "chrome/browser/infobars/infobar_tab_helper.h"
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
11 #include "content/public/browser/render_view_host.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 #include "content/public/common/page_transition_types.h" 13 #include "content/public/common/page_transition_types.h"
13 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
15 16
16 using content::OpenURLParams; 17 using content::OpenURLParams;
17 18
18 InsecureContentInfoBarDelegate::InsecureContentInfoBarDelegate( 19 InsecureContentInfoBarDelegate::InsecureContentInfoBarDelegate(
19 InfoBarTabHelper* infobar_helper, 20 InfoBarTabHelper* infobar_helper,
20 InfoBarType type) 21 InfoBarType type)
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 61 }
61 62
62 63
63 // Cancel button is labelled "load anyways". It triggers Cancel(), but really 64 // Cancel button is labelled "load anyways". It triggers Cancel(), but really
64 // means become insecure, so do the work of reloading the page. 65 // means become insecure, so do the work of reloading the page.
65 bool InsecureContentInfoBarDelegate::Cancel() { 66 bool InsecureContentInfoBarDelegate::Cancel() {
66 UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2", 67 UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
67 (type_ == DISPLAY) ? DISPLAY_USER_OVERRIDE : RUN_USER_OVERRIDE, 68 (type_ == DISPLAY) ? DISPLAY_USER_OVERRIDE : RUN_USER_OVERRIDE,
68 NUM_EVENTS); 69 NUM_EVENTS);
69 70
70 int32 routing_id = owner()->routing_id(); 71 content::WebContents* web_contents = owner()->GetWebContents();
71 owner()->Send((type_ == DISPLAY) ? static_cast<IPC::Message*>( 72 if (web_contents) {
72 new ChromeViewMsg_SetAllowDisplayingInsecureContent(routing_id, true)) : 73 int32 routing_id = web_contents->GetRoutingID();
73 new ChromeViewMsg_SetAllowRunningInsecureContent(routing_id, true)); 74 web_contents->Send((type_ == DISPLAY) ?
75 static_cast<IPC::Message*>(
76 new ChromeViewMsg_SetAllowDisplayingInsecureContent(
77 routing_id, true)) :
78 new ChromeViewMsg_SetAllowRunningInsecureContent(
79 routing_id, true));
80 }
74 return true; 81 return true;
75 } 82 }
76 83
77 string16 InsecureContentInfoBarDelegate::GetLinkText() const { 84 string16 InsecureContentInfoBarDelegate::GetLinkText() const {
78 return l10n_util::GetStringUTF16(IDS_LEARN_MORE); 85 return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
79 } 86 }
80 87
81 bool InsecureContentInfoBarDelegate::LinkClicked( 88 bool InsecureContentInfoBarDelegate::LinkClicked(
82 WindowOpenDisposition disposition) { 89 WindowOpenDisposition disposition) {
83 owner()->web_contents()->OpenURL(OpenURLParams( 90 owner()->GetWebContents()->OpenURL(OpenURLParams(
84 google_util::AppendGoogleLocaleParam(GURL( 91 google_util::AppendGoogleLocaleParam(GURL(
85 "https://www.google.com/support/chrome/bin/answer.py?answer=1342714")), 92 "https://www.google.com/support/chrome/bin/answer.py?answer=1342714")),
86 content::Referrer(), 93 content::Referrer(),
87 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 94 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
88 content::PAGE_TRANSITION_LINK, false)); 95 content::PAGE_TRANSITION_LINK, false));
89 return false; 96 return false;
90 } 97 }
OLDNEW
« no previous file with comments | « chrome/browser/infobars/insecure_content_infobar_delegate.h ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698