Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1560 entries_.erase(entries_.begin(), | 1560 entries_.erase(entries_.begin(), |
| 1561 entries_.begin() + last_committed_entry_index_); | 1561 entries_.begin() + last_committed_entry_index_); |
| 1562 entries_.erase(entries_.begin() + 1, entries_.end()); | 1562 entries_.erase(entries_.begin() + 1, entries_.end()); |
| 1563 last_committed_entry_index_ = 0; | 1563 last_committed_entry_index_ = 0; |
| 1564 } | 1564 } |
| 1565 | 1565 |
| 1566 void NavigationControllerImpl::ClearAllScreenshots() { | 1566 void NavigationControllerImpl::ClearAllScreenshots() { |
| 1567 screenshot_manager_->ClearAllScreenshots(); | 1567 screenshot_manager_->ClearAllScreenshots(); |
| 1568 } | 1568 } |
| 1569 | 1569 |
| 1570 void NavigationControllerImpl::UpdateOverridingUserAgent() { | |
| 1571 delegate_->UpdateOverridingUserAgent(); | |
|
no sievers
2016/03/15 20:00:05
Does passing this to the RWH here actually work fo
nasko
2016/03/18 21:05:25
Did you meant RenderViewHost? RenderWidgetHost sho
aelias_OOO_until_Jul13
2016/03/18 22:49:18
I took that approach initially but it failed DEPS
aelias_OOO_until_Jul13
2016/04/07 03:06:14
I was able to remove the unnecessary new Navigatio
| |
| 1572 } | |
| 1573 | |
| 1570 void NavigationControllerImpl::SetSessionStorageNamespace( | 1574 void NavigationControllerImpl::SetSessionStorageNamespace( |
| 1571 const std::string& partition_id, | 1575 const std::string& partition_id, |
| 1572 SessionStorageNamespace* session_storage_namespace) { | 1576 SessionStorageNamespace* session_storage_namespace) { |
| 1573 if (!session_storage_namespace) | 1577 if (!session_storage_namespace) |
| 1574 return; | 1578 return; |
| 1575 | 1579 |
| 1576 // We can't overwrite an existing SessionStorage without violating spec. | 1580 // We can't overwrite an existing SessionStorage without violating spec. |
| 1577 // Attempts to do so may give a tab access to another tab's session storage | 1581 // Attempts to do so may give a tab access to another tab's session storage |
| 1578 // so die hard on an error. | 1582 // so die hard on an error. |
| 1579 bool successful_insert = session_storage_namespace_map_.insert( | 1583 bool successful_insert = session_storage_namespace_map_.insert( |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2071 } | 2075 } |
| 2072 } | 2076 } |
| 2073 } | 2077 } |
| 2074 | 2078 |
| 2075 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2079 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 2076 const base::Callback<base::Time()>& get_timestamp_callback) { | 2080 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 2077 get_timestamp_callback_ = get_timestamp_callback; | 2081 get_timestamp_callback_ = get_timestamp_callback; |
| 2078 } | 2082 } |
| 2079 | 2083 |
| 2080 } // namespace content | 2084 } // namespace content |
| OLD | NEW |