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

Side by Side Diff: chrome/browser/ui/libgtk2ui/libgtk2ui.gyp

Issue 1276553007: Revert broken Linux hidpi changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review fixes Created 5 years, 4 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
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | no next file » | no next file with comments »
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 25 matching lines...) Expand all
36 '../../../../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 36 '../../../../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
37 '../../../../ui/strings/ui_strings.gyp:ui_strings', 37 '../../../../ui/strings/ui_strings.gyp:ui_strings',
38 '../../../../ui/views/views.gyp:views', 38 '../../../../ui/views/views.gyp:views',
39 '../../../chrome_resources.gyp:chrome_extra_resources', 39 '../../../chrome_resources.gyp:chrome_extra_resources',
40 '../../../chrome_resources.gyp:chrome_resources', 40 '../../../chrome_resources.gyp:chrome_resources',
41 '../../../chrome_resources.gyp:chrome_strings', 41 '../../../chrome_resources.gyp:chrome_strings',
42 '../../../chrome_resources.gyp:theme_resources', 42 '../../../chrome_resources.gyp:theme_resources',
43 ], 43 ],
44 'defines': [ 44 'defines': [
45 'LIBGTK2UI_IMPLEMENTATION', 45 'LIBGTK2UI_IMPLEMENTATION',
46 # g_settings_list_schemas is deprecated, but this function is not
47 # available on earlier version that we still need to support.
48 # See build/linux/system.gyp:gio for details.
49 'GLIB_DISABLE_DEPRECATION_WARNINGS'
50 ], 46 ],
51 # Several of our source files are named _gtk2.cc. This isn't to 47 # Several of our source files are named _gtk2.cc. This isn't to
52 # differentiate them from their source files (ninja and make are sane 48 # differentiate them from their source files (ninja and make are sane
53 # build systems, unlike MSVS). It is instead to get around the rest of 49 # build systems, unlike MSVS). It is instead to get around the rest of
54 # the normal, global gtk exclusion rules, as we are otherwise using gtk 50 # the normal, global gtk exclusion rules, as we are otherwise using gtk
55 # in a non-gtk build. 51 # in a non-gtk build.
56 'sources': [ 52 'sources': [
57 # Note: sources list duplicated in GN build. 53 # Note: sources list duplicated in GN build.
58 'app_indicator_icon.cc', 54 'app_indicator_icon.cc',
59 'app_indicator_icon.h', 55 'app_indicator_icon.h',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 '-Wno-unused-function', 113 '-Wno-unused-function',
118 114
119 # G_STATIC_ASSERT uses a typedef as a static_assert. 115 # G_STATIC_ASSERT uses a typedef as a static_assert.
120 '-Wno-unused-local-typedef', 116 '-Wno-unused-local-typedef',
121 ], 117 ],
122 }], 118 }],
123 ], 119 ],
124 }, 120 },
125 ], 121 ],
126 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698