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

Unified Diff: chrome/browser/browser.cc

Issue 350005: Use the original profile to get the sync service when building the app menu.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « no previous file | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc (revision 30303)
+++ chrome/browser/browser.cc (working copy)
@@ -654,8 +654,8 @@
command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
command_updater_.UpdateCommandEnabled(
- IDC_SYNC_BOOKMARKS,
- show_main_ui && profile_->GetProfileSyncService() != NULL);
+ IDC_SYNC_BOOKMARKS, show_main_ui &&
+ profile_->GetOriginalProfile()->GetProfileSyncService() != NULL);
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);
@@ -1201,11 +1201,13 @@
}
void Browser::OpenSyncMyBookmarksDialog() {
- ProfileSyncService* service = profile_->GetProfileSyncService();
- // TODO(timsteele): Incognito has no sync service for the time being,
- // so protect against this case.
+ ProfileSyncService* service =
+ profile_->GetOriginalProfile()->GetProfileSyncService();
+ // It shouldn't be possible to be in this function without a service.
+ DCHECK(service);
if (!service)
return;
+
if (service->HasSyncSetupCompleted()) {
ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_);
} else {
« no previous file with comments | « no previous file | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698