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 | |
| 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
| -rw-r--r-- | chrome/app/nibs/FirstRunDialog.xib | 70 | ||||
| -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 |
4 files changed, 80 insertions, 5 deletions
diff --git a/chrome/app/nibs/FirstRunDialog.xib b/chrome/app/nibs/FirstRunDialog.xib index 135f8e2..271fcdd 100644 --- a/chrome/app/nibs/FirstRunDialog.xib +++ b/chrome/app/nibs/FirstRunDialog.xib @@ -87,13 +87,13 @@ <object class="NSButton" id="328877840"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{45, 139}, {235, 18}}</string> + <string key="NSFrame">{{45, 139}, {284, 18}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1019469145"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Make Chrome my default browser</string> + <string key="NSContents">Make Google Chrome my default browser</string> <object class="NSFont" key="NSSupport" id="605141190"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> @@ -563,6 +563,70 @@ </object> <int key="connectionID">80</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: usage_stats_checkbox_hidden_</string> + <reference key="source" ref="533962116"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="533962116"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">hidden: usage_stats_checkbox_hidden_</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">usage_stats_checkbox_hidden_</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">82</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: importBookmarks</string> + <reference key="source" ref="21765562"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="21765562"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: importBookmarks</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">importBookmarks</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">84</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: usage_stats_checkbox_hidden_</string> + <reference key="source" ref="772316250"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="772316250"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">hidden: usage_stats_checkbox_hidden_</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">usage_stats_checkbox_hidden_</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">88</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: usage_stats_checkbox_hidden_</string> + <reference key="source" ref="575991284"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="575991284"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">hidden: usage_stats_checkbox_hidden_</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">usage_stats_checkbox_hidden_</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">89</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -925,7 +989,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">80</int> + <int key="maxID">89</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> 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) { |