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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 5915004: Introduce incognito preference settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed whitespaces in mac files Created 9 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 #endif 278 #endif
279 279
280 SessionService* session_service = profile_->GetSessionService(); 280 SessionService* session_service = profile_->GetSessionService();
281 if (session_service) 281 if (session_service)
282 session_service->WindowClosed(session_id_); 282 session_service->WindowClosed(session_id_);
283 283
284 TabRestoreService* tab_restore_service = profile()->GetTabRestoreService(); 284 TabRestoreService* tab_restore_service = profile()->GetTabRestoreService();
285 if (tab_restore_service) 285 if (tab_restore_service)
286 tab_restore_service->BrowserClosed(this); 286 tab_restore_service->BrowserClosed(this);
287 287
288 encoding_auto_detect_.Destroy();
289 printing_enabled_.Destroy();
290 dev_tools_disabled_.Destroy();
291 instant_enabled_.Destroy();
292 use_vertical_tabs_.Destroy();
293
288 if (profile_->IsOffTheRecord() && 294 if (profile_->IsOffTheRecord() &&
289 !BrowserList::IsOffTheRecordSessionActive()) { 295 !BrowserList::IsOffTheRecordSessionActive()) {
290 // An off-the-record profile is no longer needed, this indirectly 296 // An off-the-record profile is no longer needed, this indirectly
291 // frees its cache and cookies. 297 // frees its cache and cookies.
292 profile_->GetOriginalProfile()->DestroyOffTheRecordProfile(); 298 profile_->GetOriginalProfile()->DestroyOffTheRecordProfile();
293 } 299 }
294 300
295 // There may be pending file dialogs, we need to tell them that we've gone 301 // There may be pending file dialogs, we need to tell them that we've gone
296 // away so they don't try and call back to us. 302 // away so they don't try and call back to us.
297 if (select_file_dialog_.get()) 303 if (select_file_dialog_.get())
(...skipping 3964 matching lines...) Expand 10 before | Expand all | Expand 10 after
4262 // The page transition below is only for the purpose of inserting the tab. 4268 // The page transition below is only for the purpose of inserting the tab.
4263 browser->AddTab(view_source_contents, PageTransition::LINK); 4269 browser->AddTab(view_source_contents, PageTransition::LINK);
4264 } 4270 }
4265 4271
4266 if (profile_->HasSessionService()) { 4272 if (profile_->HasSessionService()) {
4267 SessionService* session_service = profile_->GetSessionService(); 4273 SessionService* session_service = profile_->GetSessionService();
4268 if (session_service) 4274 if (session_service)
4269 session_service->TabRestored(&view_source_contents->controller(), false); 4275 session_service->TabRestored(&view_source_contents->controller(), false);
4270 } 4276 }
4271 } 4277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698