Cleaning up after the initial Chrome Frame commit.

Review URL: http://codereview.chromium.org/242025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27367 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 153 insertions, 28 deletions

diff --git a/build/common.gypi b/build/common.gypi
index dfe931c..aad3600 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -114,7 +114,7 @@
     'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
 
     # Whether to add the experimental build define.
-    'experimental_build_define%': 0,
+    'chrome_frame_define%': 0,
 
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to prevent release.vsprops from being included.
@@ -234,8 +234,8 @@
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
-      ['experimental_build_define', {
-        'defines': ['CHROME_EXP_BUILD'],
+      ['chrome_frame_define', {
+        'defines': ['CHROME_FRAME_BUILD'],
       }],
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index fa6dfd9..9c3a298 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -43,9 +43,9 @@ const wchar_t kHelperProcessExecutablePath[] =
     PRODUCT_STRING L".app/Contents/Resources/"
     PRODUCT_STRING L" Helper.app/Contents/MacOS/" PRODUCT_STRING L" Helper";
 #endif  // OS_*
-#if defined(CHROME_EXP_BUILD)
-const wchar_t kBrowserAppName[] = L"ChromeExp";
-const char    kStatsFilename[] = "ChromeExpStats2";
+#if defined(CHROME_FRAME_BUILD)
+const wchar_t kBrowserAppName[] = L"ChromeFrame";
+const char    kStatsFilename[] = "ChromeFrameStats2";
 #elif defined(GOOGLE_CHROME_BUILD)
 const wchar_t kBrowserAppName[] = L"Chrome";
 const char    kStatsFilename[] = "ChromeStats2";
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index c9820ab..b49f877 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -31,6 +31,8 @@
           'sources': [
             'util/browser_distribution.cc',
             'util/browser_distribution.h',
+            'util/chrome_frame_distribution.cc',
+            'util/chrome_frame_distribution.h',
             'util/compat_checks.cc',
             'util/compat_checks.h',
             'util/copy_tree_work_item.cc',
@@ -80,18 +82,6 @@
             'util/work_item_list.cc',
             'util/work_item_list.h',
           ],
-          'variables': {
-            'extra_installer_util_sources%': 0,
-          },
-          'conditions': [
-            ['extra_installer_util_sources', {
-                'sources': [
-                  'util/exp/experimental_browser_distribution.cc',
-                  'util/exp/experimental_browser_distribution.h',
-                ],
-              },
-            ],
-          ],
         },
         {
           'target_name': 'gcapi_dll',
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index d15dd27..24d2f80 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -95,7 +95,7 @@ void AddUninstallShortcutWorkItems(HKEY reg_root,
   uninstall_cmd.append(L"\" --");
   uninstall_cmd.append(installer_util::switches::kUninstall);
 
-#ifdef CHROME_EXP_BUILD
+#ifdef CHROME_FRAME_BUILD
   uninstall_cmd.append(L" --");
   uninstall_cmd.append(installer_util::switches::kForceUninstall);
   uninstall_cmd.append(L" --");
@@ -246,7 +246,7 @@ bool CreateOrUpdateChromeShortcuts(const std::wstring& exe_path,
     std::wstring arguments(L" --");
     arguments.append(installer_util::switches::kUninstall);
 
-#ifdef CHROME_EXP_BUILD
+#ifdef CHROME_FRAME_BUILD
     arguments.append(L" --");
     arguments.append(installer_util::switches::kForceUninstall);
     arguments.append(L" --");
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index d4b2849..0d1772f 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -11,16 +11,13 @@
 
 #include "base/registry.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
-
-#if defined(CHROME_EXP_BUILD)
-#include "chrome/installer/util/exp/experimental_browser_distribution.h"
-#endif
+#include "chrome/installer/util/chrome_frame_distribution.h"
 
 BrowserDistribution* BrowserDistribution::GetDistribution() {
   static BrowserDistribution* dist = NULL;
   if (dist == NULL) {
-#if defined(CHROME_EXP_BUILD)
-    dist = new ExperimentalBrowserDistribution();
+#if defined(CHROME_FRAME_BUILD)
+    dist = new ChromeFrameDistribution();
 #elif defined(GOOGLE_CHROME_BUILD)
     dist = new GoogleChromeDistribution();
 #else
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
new file mode 100644
index 0000000..124edd3
--- /dev/null
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -0,0 +1,88 @@
+// Copyright (c) 2009 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.
+//
+// This file defines a specific implementation of BrowserDistribution class for
+// Chrome Frame. It overrides the bare minimum of methods necessary to get a
+// Chrome Frame installer that does not interact with Google Chrome or
+// Chromium installations.
+
+#include "chrome/installer/util/chrome_frame_distribution.h"
+
+#include "chrome/installer/util/l10n_string_util.h"
+#include "chrome/installer/util/google_update_constants.h"
+
+#include "installer_util_strings.h"
+
+std::wstring ChromeFrameDistribution::GetApplicationName() {
+  // TODO(robertshield): localize
+  return L"Google Chrome Frame";
+}
+
+std::wstring ChromeFrameDistribution::GetAlternateApplicationName() {
+  // TODO(robertshield): localize
+  return L"Chromium technology in your existing browser";
+}
+
+std::wstring ChromeFrameDistribution::GetInstallSubDir() {
+  // TODO(robertshield): localize
+  return L"Google\\Chrome Frame";
+}
+
+std::wstring ChromeFrameDistribution::GetPublisherName() {
+  const std::wstring& publisher_name =
+      installer_util::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
+  return publisher_name;
+}
+
+std::wstring ChromeFrameDistribution::GetAppDescription() {
+  return L"Chrome in a Frame.";
+}
+
+std::wstring ChromeFrameDistribution::GetStateKey() {
+  std::wstring key(google_update::kRegPathClientState);
+  key.append(L"\\");
+  key.append(google_update::kChromeGuid);
+  return key;
+}
+
+std::wstring ChromeFrameDistribution::GetStateMediumKey() {
+  std::wstring key(google_update::kRegPathClientStateMedium);
+  key.append(L"\\");
+  key.append(google_update::kChromeGuid);
+  return key;
+}
+
+std::wstring ChromeFrameDistribution::GetStatsServerURL() {
+  return L"https://clients4.google.com/firefox/metrics/collect";
+}
+
+
+std::wstring ChromeFrameDistribution::GetUninstallLinkName() {
+  return L"Uninstall Chrome Frame";
+}
+
+std::wstring ChromeFrameDistribution::GetUninstallRegPath() {
+  return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
+         L"Google Chrome Frame";
+}
+
+std::wstring ChromeFrameDistribution::GetVersionKey() {
+  std::wstring key(google_update::kRegPathClients);
+  key.append(L"\\");
+  key.append(google_update::kChromeGuid);
+  return key;
+}
+
+int ChromeFrameDistribution::GetInstallReturnCode(
+    installer_util::InstallStatus status) {
+  switch (status) {
+    case installer_util::FIRST_INSTALL_SUCCESS:
+    case installer_util::INSTALL_REPAIRED:
+    case installer_util::NEW_VERSION_UPDATED:
+    case installer_util::HIGHER_VERSION_EXISTS:
+      return 0;  // For Google Update's benefit we need to return 0 for success
+    default:
+      return status;
+  }
+}
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
new file mode 100644
index 0000000..98a250d
--- /dev/null
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -0,0 +1,50 @@
+// Copyright (c) 2009 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.
+//
+// This file extends the browser distribution with a specific implementation
+// for Chrome Frame.
+
+#ifndef CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
+#define CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
+
+#include <string>
+
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/util_constants.h"
+
+class ChromeFrameDistribution : public BrowserDistribution {
+ public:
+  virtual std::wstring GetApplicationName();
+
+  virtual std::wstring GetAlternateApplicationName();
+
+  virtual std::wstring GetInstallSubDir();
+
+  virtual std::wstring GetPublisherName();
+
+  virtual std::wstring GetAppDescription();
+
+  virtual std::wstring GetStateKey();
+
+  virtual std::wstring GetStateMediumKey();
+
+  virtual std::wstring GetStatsServerURL();
+
+  virtual std::wstring GetUninstallLinkName();
+
+  virtual std::wstring GetUninstallRegPath();
+
+  virtual std::wstring GetVersionKey();
+
+  virtual int GetInstallReturnCode(installer_util::InstallStatus status);
+
+ private:
+  friend class BrowserDistribution;
+
+  // Disallow construction from non-friends.
+  ChromeFrameDistribution() {}
+
+};
+
+#endif  // CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
diff --git a/chrome_frame/rename_me_to_supplement.gypi b/chrome_frame/rename_me_to_supplement.gypi
index fbe6e55..7c82a8d 100644
--- a/chrome_frame/rename_me_to_supplement.gypi
+++ b/chrome_frame/rename_me_to_supplement.gypi
@@ -17,8 +17,8 @@
 {

   'variables': {

     'google_update_appid': '{8BA986DA-5100-405E-AA35-86F34A02ACBF}',

-    'extra_installer_util_sources': 1,

+    'extra_installer_util_sources': 0,

     'branding': 'Chrome',

-    'experimental_build_define': 1,

+    'chrome_frame_define': 1,

   },

 } 
\ No newline at end of file