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

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: Add enum 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
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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 'file_manager_extension%': 1, 433 'file_manager_extension%': 1,
434 }, { 434 }, {
435 'file_manager_extension%': 0, 435 'file_manager_extension%': 0,
436 }], 436 }],
437 437
438 # Enable WebUI TaskManager on Chrome OS or Aura. 438 # Enable WebUI TaskManager on Chrome OS or Aura.
439 ['chromeos==1 or use_aura==1', { 439 ['chromeos==1 or use_aura==1', {
440 'webui_task_manager%': 1, 440 'webui_task_manager%': 1,
441 }], 441 }],
442 442
443 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
444 'enable_one_click_signin%': 1,
445 }],
446
443 ['OS=="android"', { 447 ['OS=="android"', {
444 'proprietary_codecs%': 1, 448 'proprietary_codecs%': 1,
445 'enable_webrtc%': 0, 449 'enable_webrtc%': 0,
446 }], 450 }],
447 451
448 # Use GPU accelerated cross process image transport by default 452 # Use GPU accelerated cross process image transport by default
449 # on linux builds with the Aura window manager 453 # on linux builds with the Aura window manager
450 ['use_aura==1 and OS=="linux"', { 454 ['use_aura==1 and OS=="linux"', {
451 'ui_compositor_image_transport%': 1, 455 'ui_compositor_image_transport%': 1,
452 }, { 456 }, {
(...skipping 2665 matching lines...) Expand 10 before | Expand all | Expand 10 after
3118 # settings in target dicts. SYMROOT is a special case, because many other 3122 # settings in target dicts. SYMROOT is a special case, because many other
3119 # Xcode variables depend on it, including variables such as 3123 # Xcode variables depend on it, including variables such as
3120 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3124 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3121 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3125 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3122 # files to appear (when present) in the UI as actual files and not red 3126 # files to appear (when present) in the UI as actual files and not red
3123 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3127 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3124 # and therefore SYMROOT, needs to be set at the project level. 3128 # and therefore SYMROOT, needs to be set at the project level.
3125 'SYMROOT': '<(DEPTH)/xcodebuild', 3129 'SYMROOT': '<(DEPTH)/xcodebuild',
3126 }, 3130 },
3127 } 3131 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chromium_strings.grd » ('j') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698