Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2368)

Unified Diff: chrome/installer/util/browser_distribution.cc

Issue 242025: Cleaning up after the initial Chrome Frame commit. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/util/chrome_frame_distribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/browser_distribution.cc
===================================================================
--- chrome/installer/util/browser_distribution.cc (revision 27181)
+++ chrome/installer/util/browser_distribution.cc (working copy)
@@ -11,16 +11,13 @@
#include "base/registry.h"
#include "chrome/installer/util/google_chrome_distribution.h"
+#include "chrome/installer/util/chrome_frame_distribution.h"
-#if defined(CHROME_EXP_BUILD)
-#include "chrome/installer/util/exp/experimental_browser_distribution.h"
-#endif
-
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
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/util/chrome_frame_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698