| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "webkit/tools/test_shell/test_navigation_controller.h" | 5 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "webkit/tools/test_shell/test_shell.h" | 8 #include "webkit/tools/test_shell/test_shell.h" |
| 9 | 9 |
| 10 // ---------------------------------------------------------------------------- | 10 // ---------------------------------------------------------------------------- |
| 11 // TestNavigationEntry | 11 // TestNavigationEntry |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 } else { | 221 } else { |
| 222 DiscardPendingEntry(); | 222 DiscardPendingEntry(); |
| 223 } | 223 } |
| 224 } | 224 } |
| 225 | 225 |
| 226 void TestNavigationController::UpdateMaxPageID() { | 226 void TestNavigationController::UpdateMaxPageID() { |
| 227 TestNavigationEntry* entry = GetActiveEntry(); | 227 TestNavigationEntry* entry = GetActiveEntry(); |
| 228 if (entry) | 228 if (entry) |
| 229 max_page_id_ = std::max(max_page_id_, entry->GetPageID()); | 229 max_page_id_ = std::max(max_page_id_, entry->GetPageID()); |
| 230 } | 230 } |
| OLD | NEW |