diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 18:18:44 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 18:18:44 +0000 |
| commit | d1d25e4d3c8fa47a78352813c061cc9f71f562ab (patch) | |
| tree | 3376caaf9d2a2257422b9fdd530f425e8c964a79 /chrome/browser | |
| parent | e86aaca212530deeabd13168c2bdc46cc5940f7c (diff) | |
| download | chromium_src-d1d25e4d3c8fa47a78352813c061cc9f71f562ab.zip chromium_src-d1d25e4d3c8fa47a78352813c061cc9f71f562ab.tar.gz chromium_src-d1d25e4d3c8fa47a78352813c061cc9f71f562ab.tar.bz2 | |
Fix several bugs in First Run.
Chromium:
* First run no longer displays every time you launch Chromium.
* Enable Stats checkbox hidden (it doesn't do anything anyway in Chromium).
General:
* Import popup menu disables with checkbox.
BUG=19163,19171
Review URL: http://codereview.chromium.org/165387
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/first_run_dialog.h | 1 | ||||
| -rw-r--r-- | chrome/browser/cocoa/first_run_dialog.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/first_run_mac.mm | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/first_run_dialog.h b/chrome/browser/cocoa/first_run_dialog.h index 1f10bc1..0b3f07a 100644 --- a/chrome/browser/cocoa/first_run_dialog.h +++ b/chrome/browser/cocoa/first_run_dialog.h @@ -15,6 +15,7 @@ BOOL stats_enabled_; BOOL make_default_browser_; BOOL import_bookmarks_; + BOOL usage_stats_checkbox_hidden_; int browser_import_selected_index_; NSArray* browser_import_list_; } diff --git a/chrome/browser/cocoa/first_run_dialog.mm b/chrome/browser/cocoa/first_run_dialog.mm index 6fdadcb7..4fe80bc 100644 --- a/chrome/browser/cocoa/first_run_dialog.mm +++ b/chrome/browser/cocoa/first_run_dialog.mm @@ -23,6 +23,12 @@ // Bound to the dialog checkbox, default to true. stats_enabled_ = YES; import_bookmarks_ = YES; + +#if !defined(GOOGLE_CHROME_BUILD) + // In Chromium builds all stats reporting is disabled so there's no reason + // to display the checkbox - the setting is always OFF. + usage_stats_checkbox_hidden_ = YES; +#endif // !GOOGLE_CHROME_BUILD } return self; } diff --git a/chrome/browser/first_run_mac.mm b/chrome/browser/first_run_mac.mm index 808b79c..eef1238 100644 --- a/chrome/browser/first_run_mac.mm +++ b/chrome/browser/first_run_mac.mm @@ -120,7 +120,6 @@ bool FirstRunController::DoFirstRun(Profile* profile, return false; } -// Don't enable stats in Chromium. #if defined(GOOGLE_CHROME_BUILD) BOOL stats_enabled = [dialog.get() statsEnabled]; @@ -132,9 +131,14 @@ bool FirstRunController::DoFirstRun(Profile* profile, InitCrashProcessInfo(); } - GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled); + +#else + // Don't enable stats in Chromium. + BOOL stats_enabled = NO; #endif // GOOGLE_CHROME_BUILD + GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled); + // If selected set as default browser. BOOL make_default_browser = [dialog.get() makeDefaultBrowser]; if (make_default_browser) { |