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

Side by Side Diff: build/common.gypi

Issue 10332185: Update behavior of one-click infobar to remove modal dialog, add "undo". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor comment fixes Created 8 years, 7 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
« no previous file with comments | « no previous file | chrome/app/chromium_strings.grd » ('j') | chrome/app/generated_resources.grd » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 'file_manager_extension%': 1, 435 'file_manager_extension%': 1,
436 }, { 436 }, {
437 'file_manager_extension%': 0, 437 'file_manager_extension%': 0,
438 }], 438 }],
439 439
440 # Enable WebUI TaskManager on Chrome OS or Aura. 440 # Enable WebUI TaskManager on Chrome OS or Aura.
441 ['chromeos==1 or use_aura==1', { 441 ['chromeos==1 or use_aura==1', {
442 'webui_task_manager%': 1, 442 'webui_task_manager%': 1,
443 }], 443 }],
444 444
445 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
446 'enable_one_click_signin%': 1,
447 }],
448
445 ['OS=="android"', { 449 ['OS=="android"', {
446 'proprietary_codecs%': 1, 450 'proprietary_codecs%': 1,
447 'enable_webrtc%': 0, 451 'enable_webrtc%': 0,
448 }], 452 }],
449 453
450 # Use GPU accelerated cross process image transport by default 454 # Use GPU accelerated cross process image transport by default
451 # on linux builds with the Aura window manager 455 # on linux builds with the Aura window manager
452 ['use_aura==1 and OS=="linux"', { 456 ['use_aura==1 and OS=="linux"', {
453 'ui_compositor_image_transport%': 1, 457 'ui_compositor_image_transport%': 1,
454 }, { 458 }, {
(...skipping 2643 matching lines...) Expand 10 before | Expand all | Expand 10 after
3098 # settings in target dicts. SYMROOT is a special case, because many other 3102 # settings in target dicts. SYMROOT is a special case, because many other
3099 # Xcode variables depend on it, including variables such as 3103 # Xcode variables depend on it, including variables such as
3100 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3104 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3101 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3105 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3102 # files to appear (when present) in the UI as actual files and not red 3106 # files to appear (when present) in the UI as actual files and not red
3103 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3107 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3104 # and therefore SYMROOT, needs to be set at the project level. 3108 # and therefore SYMROOT, needs to be set at the project level.
3105 'SYMROOT': '<(DEPTH)/xcodebuild', 3109 'SYMROOT': '<(DEPTH)/xcodebuild',
3106 }, 3110 },
3107 } 3111 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chromium_strings.grd » ('j') | chrome/app/generated_resources.grd » ('J')

Powered by Google App Engine
This is Rietveld 408576698