diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 20:23:06 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 20:23:06 +0000 |
| commit | 1e7377df1449c4e543a50c8a8a1425599c8425f7 (patch) | |
| tree | 6e8ee3adcba66e4a043e91e91e0217467682a7fd /chrome/chrome.gyp | |
| parent | 34cf340da15aceffd59c3d05e0de2a3bc5174a2d (diff) | |
| download | chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.zip chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.tar.gz chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.tar.bz2 | |
Respect Linux user prefs with regards to crash reporting.
This involves implementing GoogleUpdateSettings::[GS]etCollectStatsConsent, and a whole lot of refactoring.
BUG=none
TEST=delete config dir, run official Linux build, don't enable crash reporting, crash browser -> no crash reporting.
Review URL: http://codereview.chromium.org/115808
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 42c5b15..daef222 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -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', @@ -959,7 +961,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', @@ -1974,18 +1975,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"', { @@ -2897,9 +2886,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. @@ -2975,6 +2964,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', |