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

Unified Diff: chrome/browser/android/resource_id.h

Issue 1441143006: Disable Notifications in Incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@innoinherit
Patch Set: Address nits Created 5 years 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
Index: chrome/browser/android/resource_id.h
diff --git a/chrome/browser/android/resource_id.h b/chrome/browser/android/resource_id.h
index e6dfd6680666e93660b8a4e3e1f9bdad7e1b1c0a..b6e2773e8f1b8f0155f89ba8b4621ce746303299 100644
--- a/chrome/browser/android/resource_id.h
+++ b/chrome/browser/android/resource_id.h
@@ -3,6 +3,8 @@
// found in the LICENSE file.
// This file maps Chromium resource IDs to Android resource IDs.
+// It deliberately DOES NOT have header guards, since it is included multiple
+// times.
// LINK_RESOURCE_ID is used for IDs that come from a .grd file.
#ifndef LINK_RESOURCE_ID
@@ -24,6 +26,8 @@ LINK_RESOURCE_ID(IDR_INFOBAR_MEDIA_STREAM_MIC, R.drawable.infobar_microphone)
LINK_RESOURCE_ID(IDR_INFOBAR_MIDI, R.drawable.infobar_midi)
LINK_RESOURCE_ID(IDR_INFOBAR_MULTIPLE_DOWNLOADS,
R.drawable.infobar_multiple_downloads)
+LINK_RESOURCE_ID(IDR_INFOBAR_DESKTOP_NOTIFICATIONS,
+ R.drawable.infobar_desktop_notifications)
LINK_RESOURCE_ID(IDR_INFOBAR_SAVE_PASSWORD, R.drawable.infobar_savepassword)
LINK_RESOURCE_ID(IDR_INFOBAR_WARNING, R.drawable.infobar_warning)
LINK_RESOURCE_ID(IDR_INFOBAR_TRANSLATE, R.drawable.infobar_translate)
@@ -32,8 +36,6 @@ LINK_RESOURCE_ID(IDR_BLOCKED_POPUPS, R.drawable.infobar_blocked_popups)
// Android only infobars.
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER,
R.drawable.infobar_protected_media_identifier)
-DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NOTIFICATIONS,
- R.drawable.infobar_desktop_notifications)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_GEOLOCATION,
R.drawable.infobar_geolocation)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_FROZEN_TAB, R.drawable.infobar_restore)
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/notifications/incognito_denied_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698