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

Side by Side Diff: chrome/browser/views/bookmark_manager_view.cc

Issue 276072: The login dialog was being opened with the main browser window as a parent in... (Closed) Base URL: http://src.chromium.org/svn/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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/views/bookmark_manager_view.h" 5 #include "chrome/browser/views/bookmark_manager_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/gfx/canvas.h" 9 #include "app/gfx/canvas.h"
10 #include "app/gfx/color_utils.h" 10 #include "app/gfx/color_utils.h"
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 sync_status_button_->SetText(status_label); 853 sync_status_button_->SetText(status_label);
854 sync_status_button_->GetParent()->Layout(); 854 sync_status_button_->GetParent()->Layout();
855 } 855 }
856 856
857 void BookmarkManagerView::OpenSyncMyBookmarksDialog() { 857 void BookmarkManagerView::OpenSyncMyBookmarksDialog() {
858 if (!sync_service_) 858 if (!sync_service_)
859 return; 859 return;
860 if (sync_service_->HasSyncSetupCompleted()) { 860 if (sync_service_->HasSyncSetupCompleted()) {
861 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_); 861 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_);
862 } else { 862 } else {
863 sync_service_->EnableForUser(); 863 sync_service_->EnableForUser(GetWindow()->GetNativeWindow());
tim (not reviewing) 2009/10/29 21:58:44 what happens if you close the BookmarkManager? Doe
864 ProfileSyncService::SyncEvent( 864 ProfileSyncService::SyncEvent(
865 ProfileSyncService::START_FROM_BOOKMARK_MANAGER); 865 ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
866 } 866 }
867 } 867 }
868 #endif 868 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698