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

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

Issue 658943002: Revert of [src/chrome/browser/] Declaring the weak_ptr_factory in proper order in ui and prerender … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 host_desktop_type_( 346 host_desktop_type_(
347 BrowserWindow::AdjustHostDesktopType(params.host_desktop_type)), 347 BrowserWindow::AdjustHostDesktopType(params.host_desktop_type)),
348 content_setting_bubble_model_delegate_( 348 content_setting_bubble_model_delegate_(
349 new BrowserContentSettingBubbleModelDelegate(this)), 349 new BrowserContentSettingBubbleModelDelegate(this)),
350 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), 350 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
351 tab_restore_service_delegate_(new BrowserTabRestoreServiceDelegate(this)), 351 tab_restore_service_delegate_(new BrowserTabRestoreServiceDelegate(this)),
352 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), 352 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
353 bookmark_bar_state_(BookmarkBar::HIDDEN), 353 bookmark_bar_state_(BookmarkBar::HIDDEN),
354 command_controller_(new chrome::BrowserCommandController(this)), 354 command_controller_(new chrome::BrowserCommandController(this)),
355 window_has_shown_(false), 355 window_has_shown_(false),
356 chrome_updater_factory_(this),
356 translate_driver_observer_( 357 translate_driver_observer_(
357 new BrowserContentTranslateDriverObserver(this)), 358 new BrowserContentTranslateDriverObserver(this)),
358 chrome_updater_factory_(this),
359 weak_factory_(this) { 359 weak_factory_(this) {
360 // If this causes a crash then a window is being opened using a profile type 360 // If this causes a crash then a window is being opened using a profile type
361 // that is disallowed by policy. The crash prevents the disabled window type 361 // that is disallowed by policy. The crash prevents the disabled window type
362 // from opening at all, but the path that triggered it should be fixed. 362 // from opening at all, but the path that triggered it should be fixed.
363 CHECK(IncognitoModePrefs::CanOpenBrowser(profile_)); 363 CHECK(IncognitoModePrefs::CanOpenBrowser(profile_));
364 CHECK(!profile_->IsGuestSession() || profile_->IsOffTheRecord()) 364 CHECK(!profile_->IsGuestSession() || profile_->IsOffTheRecord())
365 << "Only off the record browser may be opened in guest mode"; 365 << "Only off the record browser may be opened in guest mode";
366 366
367 // TODO(jeremy): Move to initializer list once flag is removed. 367 // TODO(jeremy): Move to initializer list once flag is removed.
368 if (IsFastTabUnloadEnabled()) 368 if (IsFastTabUnloadEnabled())
(...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 if (contents && !allow_js_access) { 2493 if (contents && !allow_js_access) {
2494 contents->web_contents()->GetController().LoadURL( 2494 contents->web_contents()->GetController().LoadURL(
2495 target_url, 2495 target_url,
2496 content::Referrer(), 2496 content::Referrer(),
2497 ui::PAGE_TRANSITION_LINK, 2497 ui::PAGE_TRANSITION_LINK,
2498 std::string()); // No extra headers. 2498 std::string()); // No extra headers.
2499 } 2499 }
2500 2500
2501 return contents != NULL; 2501 return contents != NULL;
2502 } 2502 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698