| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 } | 249 } |
| 250 | 250 |
| 251 WebContents* NavigationControllerImpl::GetWebContents() const { | 251 WebContents* NavigationControllerImpl::GetWebContents() const { |
| 252 return delegate_->GetWebContents(); | 252 return delegate_->GetWebContents(); |
| 253 } | 253 } |
| 254 | 254 |
| 255 BrowserContext* NavigationControllerImpl::GetBrowserContext() const { | 255 BrowserContext* NavigationControllerImpl::GetBrowserContext() const { |
| 256 return browser_context_; | 256 return browser_context_; |
| 257 } | 257 } |
| 258 | 258 |
| 259 void NavigationControllerImpl::SetBrowserContext( | |
| 260 BrowserContext* browser_context) { | |
| 261 browser_context_ = browser_context; | |
| 262 } | |
| 263 | |
| 264 void NavigationControllerImpl::Restore( | 259 void NavigationControllerImpl::Restore( |
| 265 int selected_navigation, | 260 int selected_navigation, |
| 266 RestoreType type, | 261 RestoreType type, |
| 267 std::vector<std::unique_ptr<NavigationEntry>>* entries) { | 262 std::vector<std::unique_ptr<NavigationEntry>>* entries) { |
| 268 // Verify that this controller is unused and that the input is valid. | 263 // Verify that this controller is unused and that the input is valid. |
| 269 DCHECK(GetEntryCount() == 0 && !GetPendingEntry()); | 264 DCHECK(GetEntryCount() == 0 && !GetPendingEntry()); |
| 270 DCHECK(selected_navigation >= 0 && | 265 DCHECK(selected_navigation >= 0 && |
| 271 selected_navigation < static_cast<int>(entries->size())); | 266 selected_navigation < static_cast<int>(entries->size())); |
| 272 | 267 |
| 273 needs_reload_ = true; | 268 needs_reload_ = true; |
| (...skipping 1786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2060 } | 2055 } |
| 2061 } | 2056 } |
| 2062 } | 2057 } |
| 2063 | 2058 |
| 2064 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2059 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 2065 const base::Callback<base::Time()>& get_timestamp_callback) { | 2060 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 2066 get_timestamp_callback_ = get_timestamp_callback; | 2061 get_timestamp_callback_ = get_timestamp_callback; |
| 2067 } | 2062 } |
| 2068 | 2063 |
| 2069 } // namespace content | 2064 } // namespace content |
| OLD | NEW |