chrome/browser/geolocation/geolocation_infobar_delegate.cc - Issue 1384153003: Introduce a way to define Android-only IDR values that doesn't require

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: chrome/browser/geolocation/geolocation_infobar_delegate.cc

Issue 1384153003: Introduce a way to define Android-only IDR values that doesn't require (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: shortcircuit pointless lookup Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/resource_mapper.cc ('k') | chrome/browser/media/protected_media_identifier_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_infobar_delegate.cc

diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc

index b6959ca5f876386f860f7fb6f2e74765532a1047..b64ae702623c76e0d6f297d761e9d9f12771ac85 100644

--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc

+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc

@@ -4,12 +4,12 @@

#include "chrome/browser/geolocation/geolocation_infobar_delegate.h"

+#include "chrome/browser/android/android_theme_resources.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/grit/generated_resources.h"

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

#include "components/url_formatter/elide_url.h"

#include "grit/generated_resources.h"

-#include "grit/theme_resources.h"

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

// static

@@ -38,7 +38,7 @@ GeolocationInfoBarDelegate::~GeolocationInfoBarDelegate() {

}

int GeolocationInfoBarDelegate::GetIconId() const {

- return IDR_INFOBAR_GEOLOCATION;

+ return IDR_ANDROID_INFOBAR_GEOLOCATION;

}

base::string16 GeolocationInfoBarDelegate::GetMessageText() const {

« no previous file with comments | « chrome/browser/android/resource_mapper.cc ('k') | chrome/browser/media/protected_media_identifier_infobar_delegate.cc » ('j') | no next file with comments »