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

Unified Diff: chrome/chrome.gyp

Issue 115808: Respect Linux user prefs with regards to crash reporting. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: with nits fixed, also some minor fixes to breakpad_linux.cc Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google_update_settings_linux_unittest.cc ('k') | chrome/common/temp_scaffolding_stubs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 17070)
+++ chrome/chrome.gyp (working copy)
@@ -870,6 +870,8 @@
'browser/gears_integration.h',
'browser/google_update.cc',
'browser/google_update.h',
+ 'browser/google_update_settings_linux.cc',
+ 'browser/google_update_settings_mac.mm',
'browser/google_url_tracker.cc',
'browser/google_url_tracker.h',
'browser/google_util.cc',
@@ -957,7 +959,6 @@
'browser/gtk/tabs/tab_strip_gtk.h',
'browser/gtk/toolbar_star_toggle_gtk.cc',
'browser/gtk/toolbar_star_toggle_gtk.h',
- 'browser/google_update_settings_mac.mm',
'browser/hang_monitor/hung_plugin_action.cc',
'browser/hang_monitor/hung_plugin_action.h',
'browser/hang_monitor/hung_window_detector.cc',
@@ -1970,18 +1971,6 @@
'dependencies': [
'../build/linux/system.gyp:gtk',
],
- 'conditions': [
- ['linux_breakpad==1', {
- 'sources': [
- 'renderer/render_crash_handler_linux.cc',
- 'renderer/render_crash_handler_linux.h',
- ],
- }, {
- 'sources': [
- 'renderer/render_crash_handler_linux_stub.cc',
- ],
- }]
- ],
}],
# Windows-specific rules.
['OS=="win"', {
@@ -2893,9 +2882,9 @@
],
'sources': [
'app/breakpad_mac_stubs.mm',
- # *NO* files in chrome/app have unit tests (except keystone_glue)!!!
- # It seems a waste to have an app_unittests target, so for now
- # I add keystone_glue.m explicitly to this target.
+ # *NO* files in chrome/app have unit tests (except keystone_glue)!!!
+ # It seems a waste to have an app_unittests target, so for now
+ # I add keystone_glue.m explicitly to this target.
'app/keystone_glue.m',
'app/keystone_glue_unittest.mm',
# All unittests in browser, common, and renderer.
@@ -2971,6 +2960,7 @@
'browser/extensions/user_script_master_unittest.cc',
'browser/find_backend_unittest.cc',
'browser/google_url_tracker_unittest.cc',
+ 'browser/google_update_settings_linux_unittest.cc',
'browser/google_update_settings_mac_unittest.mm',
'browser/gtk/bookmark_editor_gtk_unittest.cc',
'browser/gtk/go_button_gtk_unittest.cc',
« no previous file with comments | « chrome/browser/google_update_settings_linux_unittest.cc ('k') | chrome/common/temp_scaffolding_stubs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698