diff options
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 13 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.h | 5 | ||||
-rw-r--r-- | chrome/browser/browser_prefs.cc | 1 | ||||
-rw-r--r-- | chrome/common/pref_names.cc | 16 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 7 |
5 files changed, 1 insertions, 41 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 1221ae8..2f4bc18 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -635,21 +635,8 @@ void ToggleWhenVisible(Profile* profile) { NotificationService::NoDetails()); } -void RegisterPrefs(PrefService* prefs) { - prefs->RegisterDictionaryPref(prefs::kBookmarkManagerPlacement); - prefs->RegisterIntegerPref(prefs::kBookmarkManagerSplitLocation, -1); -} - void RegisterUserPrefs(PrefService* prefs) { - // Formerly in BookmarkBarView prefs->RegisterBooleanPref(prefs::kShowBookmarkBar, false); - - // Formerly in BookmarkTableView - prefs->RegisterIntegerPref(prefs::kBookmarkTableNameWidth1, -1); - prefs->RegisterIntegerPref(prefs::kBookmarkTableURLWidth1, -1); - prefs->RegisterIntegerPref(prefs::kBookmarkTableNameWidth2, -1); - prefs->RegisterIntegerPref(prefs::kBookmarkTableURLWidth2, -1); - prefs->RegisterIntegerPref(prefs::kBookmarkTablePathWidth, -1); } void GetURLAndTitleToBookmark(TabContents* tab_contents, diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index 0802b2b..37ee96c 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -182,10 +182,7 @@ const BookmarkNode* ApplyEditsWithPossibleGroupChange( // all tabs. This is a preference modifier, not a visual modifier. void ToggleWhenVisible(Profile* profile); -// Register local state prefs for bookmark bar view. -void RegisterPrefs(PrefService* prefs); - -// Register user prefs for BookmarkBar, BookmarkView, ... +// Register user preferences for BookmarksBar. void RegisterUserPrefs(PrefService* prefs); // Fills in the URL and title for a bookmark of |tab_contents|. diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 7864ad5..99fdff6 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -76,7 +76,6 @@ void RegisterLocalState(PrefService* local_state) { SafeBrowsingService::RegisterPrefs(local_state); browser_shutdown::RegisterPrefs(local_state); chrome_browser_net::RegisterPrefs(local_state); - bookmark_utils::RegisterPrefs(local_state); PageInfoModel::RegisterPrefs(local_state); #if defined(TOOLKIT_VIEWS) BrowserView::RegisterBrowserViewPrefs(local_state); diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 5500fa6..d0fd292 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -316,22 +316,6 @@ const wchar_t kDeletePasswords[] = L"browser.clear_data.passwords"; const wchar_t kDeleteFormData[] = L"browser.clear_data.form_data"; const wchar_t kDeleteTimePeriod[] = L"browser.clear_data.time_period"; -// Integer prefs giving the widths of the columns in the bookmark table. Two -// configurations are saved, one with the path column and one without. -const wchar_t kBookmarkTableNameWidth1[] = L"bookmark_table.name_width_1"; -const wchar_t kBookmarkTableURLWidth1[] = L"bookmark_table.url_width_1"; -const wchar_t kBookmarkTableNameWidth2[] = L"bookmark_table.name_width_2"; -const wchar_t kBookmarkTableURLWidth2[] = L"bookmark_table.url_width_2"; -const wchar_t kBookmarkTablePathWidth[] = L"bookmark_table.path_width"; - -// Bounds of the bookmark manager. -const wchar_t kBookmarkManagerPlacement[] = - L"bookmark_manager.window_placement"; - -// Integer location of the split bar in the bookmark manager. -const wchar_t kBookmarkManagerSplitLocation[] = - L"bookmark_manager.split_location"; - // Boolean pref to define the default values for using spellchecker. const wchar_t kEnableSpellCheck[] = L"browser.enable_spellchecking"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index fad9b53..084ab3f 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -119,13 +119,6 @@ extern const wchar_t kDeleteCache[]; extern const wchar_t kDeleteCookies[]; extern const wchar_t kDeletePasswords[]; extern const wchar_t kDeleteFormData[]; -extern const wchar_t kBookmarkTableNameWidth1[]; -extern const wchar_t kBookmarkTableURLWidth1[]; -extern const wchar_t kBookmarkTableNameWidth2[]; -extern const wchar_t kBookmarkTableURLWidth2[]; -extern const wchar_t kBookmarkTablePathWidth[]; -extern const wchar_t kBookmarkManagerPlacement[]; -extern const wchar_t kBookmarkManagerSplitLocation[]; extern const wchar_t kEnableSpellCheck[]; extern const wchar_t kEnableAutoSpellCorrect[]; extern const wchar_t kDeleteTimePeriod[]; |