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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 8 years, 5 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
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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 'app/nibs/ChromeToMobileBubble.xib', 242 'app/nibs/ChromeToMobileBubble.xib',
243 'app/nibs/CollectedCookies.xib', 243 'app/nibs/CollectedCookies.xib',
244 'app/nibs/CookieDetailsView.xib', 244 'app/nibs/CookieDetailsView.xib',
245 'app/nibs/ContentBlockedCookies.xib', 245 'app/nibs/ContentBlockedCookies.xib',
246 'app/nibs/ContentBlockedImages.xib', 246 'app/nibs/ContentBlockedImages.xib',
247 'app/nibs/ContentBlockedJavaScript.xib', 247 'app/nibs/ContentBlockedJavaScript.xib',
248 'app/nibs/ContentBlockedMixedScript.xib', 248 'app/nibs/ContentBlockedMixedScript.xib',
249 'app/nibs/ContentBlockedPlugins.xib', 249 'app/nibs/ContentBlockedPlugins.xib',
250 'app/nibs/ContentBlockedPopups.xib', 250 'app/nibs/ContentBlockedPopups.xib',
251 'app/nibs/ContentBlockedGeolocation.xib', 251 'app/nibs/ContentBlockedGeolocation.xib',
252 'app/nibs/ContentProtocolHandlers.xib',
252 'app/nibs/DownloadItem.xib', 253 'app/nibs/DownloadItem.xib',
253 'app/nibs/DownloadShelf.xib', 254 'app/nibs/DownloadShelf.xib',
254 'app/nibs/EditSearchEngine.xib', 255 'app/nibs/EditSearchEngine.xib',
255 'app/nibs/ExtensionInstallPrompt.xib', 256 'app/nibs/ExtensionInstallPrompt.xib',
256 'app/nibs/ExtensionInstallPromptBundle.xib', 257 'app/nibs/ExtensionInstallPromptBundle.xib',
257 'app/nibs/ExtensionInstallPromptInline.xib', 258 'app/nibs/ExtensionInstallPromptInline.xib',
258 'app/nibs/ExtensionInstallPromptNoWarnings.xib', 259 'app/nibs/ExtensionInstallPromptNoWarnings.xib',
259 'app/nibs/ExtensionInstalledBubble.xib', 260 'app/nibs/ExtensionInstalledBubble.xib',
260 'app/nibs/ExtensionInstalledBubbleBundle.xib', 261 'app/nibs/ExtensionInstalledBubbleBundle.xib',
261 'app/nibs/FindBar.xib', 262 'app/nibs/FindBar.xib',
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 ], 539 ],
539 }], 540 }],
540 ], # conditions 541 ], # conditions
541 }], # OS=="mac" 542 }], # OS=="mac"
542 ], # conditions 543 ], # conditions
543 }, # target chrome_dll 544 }, # target chrome_dll
544 ], # targets 545 ], # targets
545 }], # OS=="mac" or OS=="win" 546 }], # OS=="mac" or OS=="win"
546 ], 547 ],
547 } 548 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698