summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 22:49:23 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 22:49:23 +0000
commit26413f102e91456639284b14a82a23850591527e (patch)
tree02dcac1d76bd27709b18a98188e01235f05fe872 /chrome/browser/browser.cc
parent2884f8e77c8df5d80414c70b8f775ae090eb7900 (diff)
downloadchromium_src-26413f102e91456639284b14a82a23850591527e.zip
chromium_src-26413f102e91456639284b14a82a23850591527e.tar.gz
chromium_src-26413f102e91456639284b14a82a23850591527e.tar.bz2
Remove the browser_sync flag.
BUG=none TEST=none Review URL: http://codereview.chromium.org/337034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 934ba8e..292cea5 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -653,11 +653,9 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
-#if defined(BROWSER_SYNC)
command_updater_.UpdateCommandEnabled(
IDC_SYNC_BOOKMARKS,
show_main_ui && profile_->GetProfileSyncService() != NULL);
-#endif
command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
@@ -1202,7 +1200,6 @@ void Browser::OpenImportSettingsDialog() {
window_->ShowImportDialog();
}
-#if defined(BROWSER_SYNC)
void Browser::OpenSyncMyBookmarksDialog() {
ProfileSyncService* service = profile_->GetProfileSyncService();
// TODO(timsteele): Incognito has no sync service for the time being,
@@ -1216,7 +1213,6 @@ void Browser::OpenSyncMyBookmarksDialog() {
ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_WRENCH);
}
}
-#endif // defined(BROWSER_SYNC)
void Browser::OpenAboutChromeDialog() {
UserMetrics::RecordAction(L"AboutChrome", profile_);
@@ -1462,9 +1458,7 @@ void Browser::ExecuteCommandWithDisposition(
case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break;
case IDC_SHOW_APP_MENU: ShowAppMenu(); break;
case IDC_SHOW_PAGE_MENU: ShowPageMenu(); break;
-#if defined(BROWSER_SYNC)
case IDC_SYNC_BOOKMARKS: OpenSyncMyBookmarksDialog(); break;
-#endif
case IDC_OPTIONS: OpenOptionsDialog(); break;
case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break;
case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break;