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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 1575 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 return; 1586 return;
1587 1587
1588 // We can't overwrite an existing SessionStorage without violating spec. 1588 // We can't overwrite an existing SessionStorage without violating spec.
1589 // Attempts to do so may give a tab access to another tab's session storage 1589 // Attempts to do so may give a tab access to another tab's session storage
1590 // so die hard on an error. 1590 // so die hard on an error.
1591 bool successful_insert = session_storage_namespace_map_.insert( 1591 bool successful_insert = session_storage_namespace_map_.insert(
1592 make_pair(partition_id, 1592 make_pair(partition_id,
1593 static_cast<SessionStorageNamespaceImpl*>( 1593 static_cast<SessionStorageNamespaceImpl*>(
1594 session_storage_namespace))) 1594 session_storage_namespace)))
1595 .second; 1595 .second;
1596 CHECK(successful_insert) << "Cannot replace existing SessionStorageNamespace"; 1596 // Cannot replace existing SessionStorageNamespace
1597 CHECK(successful_insert);
1597 } 1598 }
1598 1599
1599 bool NavigationControllerImpl::IsUnmodifiedBlankTab() const { 1600 bool NavigationControllerImpl::IsUnmodifiedBlankTab() const {
1600 return IsInitialNavigation() && 1601 return IsInitialNavigation() &&
1601 !GetLastCommittedEntry() && 1602 !GetLastCommittedEntry() &&
1602 !delegate_->HasAccessedInitialDocument(); 1603 !delegate_->HasAccessedInitialDocument();
1603 } 1604 }
1604 1605
1605 SessionStorageNamespace* 1606 SessionStorageNamespace*
1606 NavigationControllerImpl::GetSessionStorageNamespace(SiteInstance* instance) { 1607 NavigationControllerImpl::GetSessionStorageNamespace(SiteInstance* instance) {
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
2077 } 2078 }
2078 } 2079 }
2079 } 2080 }
2080 2081
2081 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 2082 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
2082 const base::Callback<base::Time()>& get_timestamp_callback) { 2083 const base::Callback<base::Time()>& get_timestamp_callback) {
2083 get_timestamp_callback_ = get_timestamp_callback; 2084 get_timestamp_callback_ = get_timestamp_callback;
2084 } 2085 }
2085 2086
2086 } // namespace content 2087 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698