components/google/core/browser/google_url_tracker_infobar_delegate.cc - Issue 316203003: Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper)

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: components/google/core/browser/google_url_tracker_infobar_delegate.cc

Issue 316203003: Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Nits 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/google/core/browser/google_url_tracker_infobar_delegate.h ('k') | components/google/core/browser/google_url_tracker_map_entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/google/core/browser/google_url_tracker_infobar_delegate.cc

diff --git a/chrome/browser/google/google_url_tracker_infobar_delegate.cc b/components/google/core/browser/google_url_tracker_infobar_delegate.cc

similarity index 90%

rename from chrome/browser/google/google_url_tracker_infobar_delegate.cc

rename to components/google/core/browser/google_url_tracker_infobar_delegate.cc

index 5fe1eee4a26db6b7b205cf757e669853fc916a54..a1e75f2326e1b437966f94a197e048bdbb614219 100644

--- a/chrome/browser/google/google_url_tracker_infobar_delegate.cc

+++ b/components/google/core/browser/google_url_tracker_infobar_delegate.cc

@@ -2,14 +2,13 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/google/google_url_tracker_infobar_delegate.h"

+#include "components/google/core/browser/google_url_tracker_infobar_delegate.h"

-#include "chrome/browser/google/google_url_tracker.h"

-#include "chrome/browser/google/google_url_tracker_navigation_helper.h"

-#include "chrome/browser/google/google_util.h"

+#include "components/google/core/browser/google_url_tracker.h"

+#include "components/google/core/browser/google_url_tracker_navigation_helper.h"

#include "components/infobars/core/infobar.h"

#include "components/infobars/core/infobar_manager.h"

-#include "grit/generated_resources.h"

+#include "grit/components_strings.h"

#include "net/base/net_util.h"

#include "ui/base/l10n/l10n_util.h"

@@ -100,13 +99,13 @@ base::string16 GoogleURLTrackerInfoBarDelegate::GetButtonLabel(

}

base::string16 GoogleURLTrackerInfoBarDelegate::GetLinkText() const {

- return l10n_util::GetStringUTF16(IDS_LEARN_MORE);

+ return l10n_util::GetStringUTF16(IDS_GOOGLE_URL_TRACKER_INFOBAR_LEARN_MORE);

}

bool GoogleURLTrackerInfoBarDelegate::LinkClicked(

WindowOpenDisposition disposition) {

navigation_helper_->OpenURL(

- google_util::AppendGoogleLocaleParam(GURL(

+ google_url_tracker_->client()->AppendGoogleLocaleParam(GURL(

"https://www.google.com/support/chrome/bin/answer.py?"

"answer=1618699")),

(disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,