summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 05:58:17 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 05:58:17 +0000
commit2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c (patch)
tree617cf49b21490c8e7b2e3c5a821c5d72c5735894 /chrome/common
parent492399e06e64635ca8e3191f0653a8b081863b33 (diff)
downloadchromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.zip
chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.gz
chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.bz2
Fix 1295677: REGRESSION: Import SETS startup page to imported home page.
We had only kHomePage pref before, which if blank/set to chrome-internal: meant that the New Tab page should be shown when Home is pressed. Now we add a pref called kHomePageIsNewTabPage for this purpose, which allows us to set the kHomePage value during import without actually using it as the HomePage (effectively importing home page becomes importing a default suggestion for when the users want a home page instead of the New Tab page). BUG=1295677 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc3
-rw-r--r--chrome/common/pref_names.h7
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 77f68cd..ea7ec00 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -34,6 +34,9 @@ namespace prefs {
// *************** PROFILE PREFS ***************
// These are attached to the user profile
+// A boolean specifying whether the New Tab page is the home page or not.
+const wchar_t kHomePageIsNewTabPage[] = L"homepage_is_newtabpage";
+
// This is the URL of the page to load when opening new tabs.
const wchar_t kHomePage[] = L"homepage";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index eb1f3fc..610f2ed 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -29,12 +29,13 @@
// Constants for the names of various preferences, for easier changing.
-#ifndef CHROME_COMMON_PREF_NAMES_H__
-#define CHROME_COMMON_PREF_NAMES_H__
+#ifndef CHROME_COMMON_PREF_NAMES_H_
+#define CHROME_COMMON_PREF_NAMES_H_
namespace prefs {
// Profile prefs
+extern const wchar_t kHomePageIsNewTabPage[];
extern const wchar_t kHomePage[];
extern const wchar_t kProfileName[];
extern const wchar_t kProfileNickname[];
@@ -164,4 +165,4 @@ extern const wchar_t kNumFoldersInOtherBookmarkFolder[];
extern const wchar_t kNumKeywords[];
}
-#endif // CHROME_COMMON_PREF_NAMES_H__
+#endif // CHROME_COMMON_PREF_NAMES_H_