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

Side by Side Diff: chrome/browser/browser.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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #include "app/animation.h" 7 #include "app/animation.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/keyboard_codes.h" 10 #include "base/keyboard_codes.h"
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 #ifdef CHROME_PERSONALIZATION 1187 #ifdef CHROME_PERSONALIZATION
1188 void Browser::OpenSyncMyBookmarksDialog() { 1188 void Browser::OpenSyncMyBookmarksDialog() {
1189 ProfileSyncService* service = profile_->GetProfileSyncService(); 1189 ProfileSyncService* service = profile_->GetProfileSyncService();
1190 // TODO(timsteele): Incognito has no sync service for the time being, 1190 // TODO(timsteele): Incognito has no sync service for the time being,
1191 // so protect against this case. 1191 // so protect against this case.
1192 if (!service) 1192 if (!service)
1193 return; 1193 return;
1194 if (service->HasSyncSetupCompleted()) { 1194 if (service->HasSyncSetupCompleted()) {
1195 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_); 1195 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_);
1196 } else { 1196 } else {
1197 service->EnableForUser(); 1197 service->EnableForUser(NULL);
1198 ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_WRENCH); 1198 ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_WRENCH);
1199 } 1199 }
1200 } 1200 }
1201 #endif 1201 #endif
1202 1202
1203 void Browser::OpenAboutChromeDialog() { 1203 void Browser::OpenAboutChromeDialog() {
1204 UserMetrics::RecordAction(L"AboutChrome", profile_); 1204 UserMetrics::RecordAction(L"AboutChrome", profile_);
1205 window_->ShowAboutChromeDialog(); 1205 window_->ShowAboutChromeDialog();
1206 } 1206 }
1207 1207
(...skipping 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after
2917 /////////////////////////////////////////////////////////////////////////////// 2917 ///////////////////////////////////////////////////////////////////////////////
2918 // BrowserToolbarModel (private): 2918 // BrowserToolbarModel (private):
2919 2919
2920 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 2920 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
2921 // This |current_tab| can be NULL during the initialization of the 2921 // This |current_tab| can be NULL during the initialization of the
2922 // toolbar during window creation (i.e. before any tabs have been added 2922 // toolbar during window creation (i.e. before any tabs have been added
2923 // to the window). 2923 // to the window).
2924 TabContents* current_tab = browser_->GetSelectedTabContents(); 2924 TabContents* current_tab = browser_->GetSelectedTabContents();
2925 return current_tab ? &current_tab->controller() : NULL; 2925 return current_tab ? &current_tab->controller() : NULL;
2926 } 2926 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/dom_ui/new_tab_page_sync_handler.cc » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698