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

Side by Side Diff: chrome/chrome.gyp

Issue 150171: Convert menu strings to UTF16, fix some views-GTK build errors. (Closed)
Patch Set: Created 11 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
« no previous file with comments | « chrome/browser/views/toolbar_view.cc ('k') | views/controls/menu/menu_2.h » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 2006 matching lines...) Expand 10 before | Expand all | Expand 10 after
2017 ['include', '^browser/gtk/options'], 2017 ['include', '^browser/gtk/options'],
2018 ['include', '^browser/gtk/menu_gtk.cc'], 2018 ['include', '^browser/gtk/menu_gtk.cc'],
2019 ['include', '^browser/gtk/menu_gtk.h'], 2019 ['include', '^browser/gtk/menu_gtk.h'],
2020 ['include', '^browser/gtk/sad_tab_gtk.cc'], 2020 ['include', '^browser/gtk/sad_tab_gtk.cc'],
2021 ['include', '^browser/gtk/sad_tab_gtk.h'], 2021 ['include', '^browser/gtk/sad_tab_gtk.h'],
2022 2022
2023 # More GTK stuff to exclude outside of the browser/gtk directory 2023 # More GTK stuff to exclude outside of the browser/gtk directory
2024 ['exclude', '^browser/bookmarks/bookmark_context_menu_gtk.cc'], 2024 ['exclude', '^browser/bookmarks/bookmark_context_menu_gtk.cc'],
2025 2025
2026 # Other excluded stuff. 2026 # Other excluded stuff.
2027 ['exclude', '^browser/browser_theme_provider_gtk.cc'],
2027 ['exclude', '^browser/extensions/external_registry_extension_pro vider_win.cc'], 2028 ['exclude', '^browser/extensions/external_registry_extension_pro vider_win.cc'],
2028 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 2029 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
2029 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 2030 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
2030 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. cc'], 2031 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. cc'],
2031 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'], 2032 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'],
2032 ], 2033 ],
2033 }], 2034 }],
2034 ['linux2==1',{ 2035 ['linux2==1',{
2035 'sources/': [ 2036 'sources/': [
2036 ['include', 'browser/views/new_browser_window_widget.cc'], 2037 ['include', 'browser/views/new_browser_window_widget.cc'],
(...skipping 2821 matching lines...) Expand 10 before | Expand all | Expand 10 after
4858 # Use outputs of this action as inputs for the main target build. 4859 # Use outputs of this action as inputs for the main target build.
4859 # Seems as a misnomer but makes this happy on Linux (scons). 4860 # Seems as a misnomer but makes this happy on Linux (scons).
4860 'process_outputs_as_sources': 1, 4861 'process_outputs_as_sources': 1,
4861 }, 4862 },
4862 ], # 'actions' 4863 ], # 'actions'
4863 }, 4864 },
4864 ] 4865 ]
4865 }], 4866 }],
4866 ], # 'conditions' 4867 ], # 'conditions'
4867 } 4868 }
OLDNEW
« no previous file with comments | « chrome/browser/views/toolbar_view.cc ('k') | views/controls/menu/menu_2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698