From 391705c6b3aaff7d8d1b60a2d87409633978f7b7 Mon Sep 17 00:00:00 2001 From: "msw@chromium.org" Date: Thu, 12 Jan 2012 21:52:41 +0000 Subject: Implement the new first run bubble, clean up old bubbles. Remove large/minimal/oem bubble types, use a single bubble. Update strings, remove unused code, add Change link/button. Point Change link to chrome://settings/searchEngines for now. Old string: "Search using Google from right here" New string: "You can search from here with Google!" New link/button text: "Change" Mac xib changes: Add 'Change' button, widen bubble to fit. BUG=107005 TEST=First run search engine bubble now says "You can search from here with Google!" TBR=pkasting Review URL: http://codereview.chromium.org/9016036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117521 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/master_preferences.h | 3 +-- chrome/installer/util/master_preferences_constants.cc | 3 +-- chrome/installer/util/master_preferences_constants.h | 4 +--- chrome/installer/util/master_preferences_unittest.cc | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'chrome/installer') diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h index 739ad1b..51d6673 100644 --- a/chrome/installer/util/master_preferences.h +++ b/chrome/installer/util/master_preferences.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -40,7 +40,6 @@ const char kDefaultMasterPrefs[] = "master_preferences"; // "distribution": { // "alternate_shortcut_text": false, // "auto_launch_chrome": false, -// "oem_bubble": false, // "chrome_shortcut_icon_index": 0, // "create_all_shortcuts": true, // "import_bookmarks": false, diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc index e2d0a6b..f5a9066 100644 --- a/chrome/installer/util/master_preferences_constants.cc +++ b/chrome/installer/util/master_preferences_constants.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,6 @@ namespace installer { namespace master_preferences { - const char kAltFirstRunBubble[] = "oem_bubble"; const char kAltShortcutText[] = "alternate_shortcut_text"; const char kAutoLaunchChrome[] = "auto_launch_chrome"; const char kChrome[] = "chrome"; diff --git a/chrome/installer/util/master_preferences_constants.h b/chrome/installer/util/master_preferences_constants.h index b22649e..a0eaf19 100644 --- a/chrome/installer/util/master_preferences_constants.h +++ b/chrome/installer/util/master_preferences_constants.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -18,8 +18,6 @@ namespace master_preferences { // Boolean. Use alternate text for the shortcut. Cmd line override present. extern const char kAltShortcutText[]; -// Boolean. Use alternate smaller first run info bubble. -extern const char kAltFirstRunBubble[]; // Boolean. Whether to instruct the installer to auto-launch chrome on computer // startup. The default (if not provided) is |false|. extern const char kAutoLaunchChrome[]; diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc index fd061e8e..c322476 100644 --- a/chrome/installer/util/master_preferences_unittest.cc +++ b/chrome/installer/util/master_preferences_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -60,7 +60,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) { " \"verbose_logging\": true,\n" " \"require_eula\": true,\n" " \"alternate_shortcut_text\": true,\n" - " \"oem_bubble\": true,\n" " \"chrome_shortcut_icon_index\": 1,\n" " \"ping_delay\": 40,\n" " \"search_engine_experiment\": true\n" @@ -88,7 +87,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) { installer::master_preferences::kVerboseLogging, installer::master_preferences::kRequireEula, installer::master_preferences::kAltShortcutText, - installer::master_preferences::kAltFirstRunBubble, installer::master_preferences::kSearchEngineExperimentPref, }; -- cgit v1.1