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

Unified Diff: chrome/browser/first_run/first_run_mac.mm

Issue 7655056: Enable brand codes and master preferences on the Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: expando Created 9 years, 4 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/browser/first_run/first_run_gtk.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run_mac.mm
diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm
index c866583503b05956bd9b39d8c09b97637ae06c0e..7ddea47c0a6bad7f8bcfb57b38eb5dac3d903c36 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_mac.mm
@@ -5,6 +5,9 @@
#include "chrome/browser/first_run/first_run.h"
#include "base/file_path.h"
+#include "base/string_util.h"
+#include "chrome/browser/mac/keystone_glue.h"
+#include "chrome/browser/mac/master_prefs.h"
bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
// http://crbug.com/48880
@@ -13,8 +16,10 @@ bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
// static
bool FirstRun::IsOrganicFirstRun() {
- // We treat all installs as organic.
- return true;
+ std::string brand = keystone_glue::BrandCode();
+ return brand.empty() ||
+ StartsWithASCII(brand, "GG", true) ||
+ StartsWithASCII(brand, "EU", true);
}
// static
@@ -22,3 +27,8 @@ void FirstRun::PlatformSetup() {
// Things that Windows does here (creating a desktop icon, for example) are
// not needed.
}
+
+// static
+FilePath FirstRun::MasterPrefsPath() {
+ return master_prefs::MasterPrefsPath();
+}
« no previous file with comments | « chrome/browser/first_run/first_run_gtk.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698