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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/tab_contents/insecure_content_infobar_delegate.h" 5 #include "chrome/browser/tab_contents/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/browser/tab_contents/tab_contents.h" 11 #include "content/browser/tab_contents/tab_contents.h"
12 #include "content/common/page_transition_types.h" 12 #include "content/public/common/page_transition_types.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 15
16 InsecureContentInfoBarDelegate::InsecureContentInfoBarDelegate( 16 InsecureContentInfoBarDelegate::InsecureContentInfoBarDelegate(
17 InfoBarTabHelper* infobar_helper, 17 InfoBarTabHelper* infobar_helper,
18 InfoBarType type) 18 InfoBarType type)
19 : ConfirmInfoBarDelegate(infobar_helper), 19 : ConfirmInfoBarDelegate(infobar_helper),
20 type_(type) { 20 type_(type) {
21 UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2", 21 UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
22 (type_ == DISPLAY) ? DISPLAY_INFOBAR_SHOWN : RUN_INFOBAR_SHOWN, 22 (type_ == DISPLAY) ? DISPLAY_INFOBAR_SHOWN : RUN_INFOBAR_SHOWN,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 string16 InsecureContentInfoBarDelegate::GetLinkText() const { 75 string16 InsecureContentInfoBarDelegate::GetLinkText() const {
76 return l10n_util::GetStringUTF16(IDS_LEARN_MORE); 76 return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
77 } 77 }
78 78
79 bool InsecureContentInfoBarDelegate::LinkClicked( 79 bool InsecureContentInfoBarDelegate::LinkClicked(
80 WindowOpenDisposition disposition) { 80 WindowOpenDisposition disposition) {
81 owner()->tab_contents()->OpenURL( 81 owner()->tab_contents()->OpenURL(
82 google_util::AppendGoogleLocaleParam(GURL( 82 google_util::AppendGoogleLocaleParam(GURL(
83 "https://www.google.com/support/chrome/bin/answer.py?answer=1342714")), 83 "https://www.google.com/support/chrome/bin/answer.py?answer=1342714")),
84 GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 84 GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
85 PageTransition::LINK); 85 content::PAGE_TRANSITION_LINK);
86 return false; 86 return false;
87 } 87 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/background_contents.cc ('k') | chrome/browser/tab_contents/language_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698