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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/android/resource_id.h

Issue 1435263003: [Android] Show document mode opt-out InfoBar on selected devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed isOptedInToDocumentMode Created 5 years, 1 month 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
« chrome/browser/android/chrome_jni_registrar.cc ('K') | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/ui/android/infobars/tabbed_mode_opt_in_infobar_delegate.h » ('j') | chrome/browser/ui/android/infobars/tabbed_mode_opt_in_infobar_delegate.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // This file maps Chromium resource IDs to Android resource IDs. 5 // This file maps Chromium resource IDs to Android resource IDs.
6 6
7 // LINK_RESOURCE_ID is used for IDs that come from a .grd file. 7 // LINK_RESOURCE_ID is used for IDs that come from a .grd file.
8 #ifndef LINK_RESOURCE_ID 8 #ifndef LINK_RESOURCE_ID
9 #error "LINK_RESOURCE_ID should be defined before including this file" 9 #error "LINK_RESOURCE_ID should be defined before including this file"
10 #endif 10 #endif
(...skipping 21 matching lines...) Expand all
32 // Android only infobars. 32 // Android only infobars.
33 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER, 33 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER,
34 R.drawable.infobar_protected_media_identifier) 34 R.drawable.infobar_protected_media_identifier)
35 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NOTIFICATIONS, 35 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NOTIFICATIONS,
36 R.drawable.infobar_desktop_notifications) 36 R.drawable.infobar_desktop_notifications)
37 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_GEOLOCATION, 37 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_GEOLOCATION,
38 R.drawable.infobar_geolocation) 38 R.drawable.infobar_geolocation)
39 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_FROZEN_TAB, R.drawable.infobar_restore) 39 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_FROZEN_TAB, R.drawable.infobar_restore)
40 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_FULLSCREEN, 40 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_FULLSCREEN,
41 R.drawable.infobar_fullscreen) 41 R.drawable.infobar_fullscreen)
42 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_TABBED_MODE_OPT_IN,
43 R.drawable.infobar_tabbed_mode_opt_in)
42 44
43 // WebsiteSettingsUI images, used in ConnectionInfoPopup 45 // WebsiteSettingsUI images, used in ConnectionInfoPopup
44 // Good: 46 // Good:
45 LINK_RESOURCE_ID(IDR_PAGEINFO_GOOD, R.drawable.pageinfo_good) 47 LINK_RESOURCE_ID(IDR_PAGEINFO_GOOD, R.drawable.pageinfo_good)
46 // Warnings: 48 // Warnings:
47 LINK_RESOURCE_ID(IDR_PAGEINFO_WARNING_MINOR, R.drawable.pageinfo_warning) 49 LINK_RESOURCE_ID(IDR_PAGEINFO_WARNING_MINOR, R.drawable.pageinfo_warning)
48 // Bad: 50 // Bad:
49 LINK_RESOURCE_ID(IDR_PAGEINFO_BAD, R.drawable.pageinfo_bad) 51 LINK_RESOURCE_ID(IDR_PAGEINFO_BAD, R.drawable.pageinfo_bad)
50 // Should never occur, use warning just in case: 52 // Should never occur, use warning just in case:
51 // Enterprise managed: ChromeOS only. 53 // Enterprise managed: ChromeOS only.
(...skipping 11 matching lines...) Expand all
63 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_GENERIC, R.drawable.generic_card) 65 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_GENERIC, R.drawable.generic_card)
64 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_MASTERCARD, R.drawable.mc_card) 66 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_MASTERCARD, R.drawable.mc_card)
65 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_VISA, R.drawable.visa_card) 67 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_VISA, R.drawable.visa_card)
66 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_SCAN_NEW, android.R.drawable.ic_menu_camera) 68 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_SCAN_NEW, android.R.drawable.ic_menu_camera)
67 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_SCAN_NEW_KEYBOARD_ACCESSORY, 69 LINK_RESOURCE_ID(IDR_AUTOFILL_CC_SCAN_NEW_KEYBOARD_ACCESSORY,
68 org.chromium.chrome.R.drawable.ic_photo_camera) 70 org.chromium.chrome.R.drawable.ic_photo_camera)
69 LINK_RESOURCE_ID(IDR_CREDIT_CARD_CVC_HINT, R.drawable.cvc_icon) 71 LINK_RESOURCE_ID(IDR_CREDIT_CARD_CVC_HINT, R.drawable.cvc_icon)
70 LINK_RESOURCE_ID(IDR_CREDIT_CARD_CVC_HINT_AMEX, R.drawable.cvc_icon_amex) 72 LINK_RESOURCE_ID(IDR_CREDIT_CARD_CVC_HINT_AMEX, R.drawable.cvc_icon_amex)
71 LINK_RESOURCE_ID(IDR_AUTOFILL_SETTINGS, 73 LINK_RESOURCE_ID(IDR_AUTOFILL_SETTINGS,
72 org.chromium.chrome.R.drawable.ic_settings) 74 org.chromium.chrome.R.drawable.ic_settings)
OLDNEW
« chrome/browser/android/chrome_jni_registrar.cc ('K') | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/ui/android/infobars/tabbed_mode_opt_in_infobar_delegate.h » ('j') | chrome/browser/ui/android/infobars/tabbed_mode_opt_in_infobar_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698