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

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 9559002: Bug 111139: Deprecate HOMEPAGE option, remove the UI for it, migrate users away from it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, 140 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
141 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, 141 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
142 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, 142 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
143 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, 143 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
144 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, 144 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
145 { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE }, 145 { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE },
146 { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE }, 146 { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE },
147 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, 147 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
148 { "settingsTitle", IDS_SETTINGS_TITLE }, 148 { "settingsTitle", IDS_SETTINGS_TITLE },
149 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES }, 149 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES },
150 { "startupShowHomePage", IDS_OPTIONS2_STARTUP_SHOW_HOME_PAGE },
151 { "startupShowNewTab", IDS_OPTIONS2_STARTUP_SHOW_NEWTAB }, 150 { "startupShowNewTab", IDS_OPTIONS2_STARTUP_SHOW_NEWTAB },
152 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION }, 151 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION },
153 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES }, 152 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES },
154 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS }, 153 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS },
155 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL }, 154 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL },
156 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, 155 { "themesGallery", IDS_THEMES_GALLERY_BUTTON },
157 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, 156 { "themesGalleryURL", IDS_THEMES_GALLERY_URL },
158 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME }, 157 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME },
159 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, 158 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
160 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 159 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 sync_status->SetBoolean("hasUnrecoverableError", 758 sync_status->SetBoolean("hasUnrecoverableError",
760 service->unrecoverable_error_detected()); 759 service->unrecoverable_error_detected());
761 sync_status->SetBoolean("autoLoginVisible", 760 sync_status->SetBoolean("autoLoginVisible",
762 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) && 761 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) &&
763 service->AreCredentialsAvailable()); 762 service->AreCredentialsAvailable());
764 763
765 return sync_status; 764 return sync_status;
766 } 765 }
767 766
768 } // namespace options2 767 } // namespace options2
OLDNEW
« chrome/browser/prefs/session_startup_pref.cc ('K') | « chrome/browser/ui/browser_init.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698