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

Side by Side Diff: chrome/browser/google/google_url_tracker_infobar_delegate.cc

Issue 302313006: GoogleURLTrackerInfoBarDelegate: Initialize uninitialized member in constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/google/google_url_tracker_infobar_delegate.h" 5 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h"
6 6
7 #include "chrome/browser/google/google_url_tracker.h" 7 #include "chrome/browser/google/google_url_tracker.h"
8 #include "chrome/browser/google/google_url_tracker_navigation_helper.h" 8 #include "chrome/browser/google/google_url_tracker_navigation_helper.h"
9 #include "chrome/browser/google/google_util.h" 9 #include "chrome/browser/google/google_util.h"
10 #include "components/infobars/core/infobar.h" 10 #include "components/infobars/core/infobar.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 if (new_search_url.is_valid()) 66 if (new_search_url.is_valid())
67 navigation_helper->OpenURL(new_search_url, CURRENT_TAB, false); 67 navigation_helper->OpenURL(new_search_url, CURRENT_TAB, false);
68 } 68 }
69 69
70 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate( 70 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate(
71 GoogleURLTracker* google_url_tracker, 71 GoogleURLTracker* google_url_tracker,
72 const GURL& search_url) 72 const GURL& search_url)
73 : ConfirmInfoBarDelegate(), 73 : ConfirmInfoBarDelegate(),
74 google_url_tracker_(google_url_tracker), 74 google_url_tracker_(google_url_tracker),
75 navigation_helper_weak_ptr_(NULL),
75 search_url_(search_url), 76 search_url_(search_url),
76 pending_id_(0) { 77 pending_id_(0) {
77 } 78 }
78 79
79 GoogleURLTrackerInfoBarDelegate::~GoogleURLTrackerInfoBarDelegate() { 80 GoogleURLTrackerInfoBarDelegate::~GoogleURLTrackerInfoBarDelegate() {
80 } 81 }
81 82
82 base::string16 GoogleURLTrackerInfoBarDelegate::GetMessageText() const { 83 base::string16 GoogleURLTrackerInfoBarDelegate::GetMessageText() const {
83 return l10n_util::GetStringFUTF16( 84 return l10n_util::GetStringFUTF16(
84 IDS_GOOGLE_URL_TRACKER_INFOBAR_MESSAGE, 85 IDS_GOOGLE_URL_TRACKER_INFOBAR_MESSAGE,
(...skipping 26 matching lines...) Expand all
111 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 112 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
112 true); 113 true);
113 return false; 114 return false;
114 } 115 }
115 116
116 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal( 117 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal(
117 const NavigationDetails& details) const { 118 const NavigationDetails& details) const {
118 return (details.entry_id != contents_unique_id()) && 119 return (details.entry_id != contents_unique_id()) &&
119 (details.entry_id != pending_id_); 120 (details.entry_id != pending_id_);
120 } 121 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698