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

Side by Side Diff: build/common.gypi

Issue 9310050: [cros] Error bubble on login is displayed to the left of Gaia frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: New bubble style. Created 8 years, 10 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 'chromium_win_pch%': 1 371 'chromium_win_pch%': 1
372 }], 372 }],
373 373
374 ['use_aura==1 or chromeos==1', { 374 ['use_aura==1 or chromeos==1', {
375 'enable_plugin_installation%': 0, 375 'enable_plugin_installation%': 0,
376 }, { 376 }, {
377 'enable_plugin_installation%': 1, 377 'enable_plugin_installation%': 1,
378 }], 378 }],
379 379
380 # Set to 0 to not use third_party/gold as the linker. 380 # Set to 0 to not use third_party/gold as the linker.
381 # On by default for x64 Linux. Off for ChromeOS as cross-compiling 381 # On by default for x64 Linux.
382 # makes things complicated. 382 ['host_arch=="x64"', {
xiyuan 2012/02/07 17:51:40 Is this change a result of rebase/merge?
Ivan Korotkov 2012/02/07 17:57:28 Yep, thanks.
383 ['chromeos==0 and host_arch=="x64"', {
384 'linux_use_gold_binary%': 1, 383 'linux_use_gold_binary%': 1,
385 }, { 384 }, {
386 'linux_use_gold_binary%': 0, 385 'linux_use_gold_binary%': 0,
387 }], 386 }],
388 387
389 # Enable canvas_skia_skia.cc incrementally on different platforms. 388 # Enable canvas_skia_skia.cc incrementally on different platforms.
390 # http://crbug.com/105550 389 # http://crbug.com/105550
391 ['OS=="win"', { 390 ['OS=="win"', {
392 'use_canvas_skia_skia%': 1, 391 'use_canvas_skia_skia%': 1,
393 }], 392 }],
(...skipping 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after
2767 # settings in target dicts. SYMROOT is a special case, because many other 2766 # settings in target dicts. SYMROOT is a special case, because many other
2768 # Xcode variables depend on it, including variables such as 2767 # Xcode variables depend on it, including variables such as
2769 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2768 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2770 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2769 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2771 # files to appear (when present) in the UI as actual files and not red 2770 # files to appear (when present) in the UI as actual files and not red
2772 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2771 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2773 # and therefore SYMROOT, needs to be set at the project level. 2772 # and therefore SYMROOT, needs to be set at the project level.
2774 'SYMROOT': '<(DEPTH)/xcodebuild', 2773 'SYMROOT': '<(DEPTH)/xcodebuild',
2775 }, 2774 },
2776 } 2775 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/bubble.css » ('j') | chrome/browser/resources/chromeos/login/bubble.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698