| OLD | NEW |
| 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 #import "ios/web/navigation/crw_session_controller.h" | 5 #import "ios/web/navigation/crw_session_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 #include <vector> | 10 #include <vector> |
| 9 | 11 |
| 10 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
| 11 #include "base/logging.h" | 13 #include "base/logging.h" |
| 12 #include "base/mac/objc_property_releaser.h" | 14 #include "base/mac/objc_property_releaser.h" |
| 13 #import "base/mac/scoped_nsobject.h" | 15 #import "base/mac/scoped_nsobject.h" |
| 14 #include "base/metrics/user_metrics_action.h" | 16 #include "base/metrics/user_metrics_action.h" |
| 15 #include "base/strings/sys_string_conversions.h" | 17 #include "base/strings/sys_string_conversions.h" |
| 16 #import "ios/web/history_state_util.h" | 18 #import "ios/web/history_state_util.h" |
| (...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 item->SetURL(loaded_url); | 887 item->SetURL(loaded_url); |
| 886 item->SetReferrer(referrer); | 888 item->SetReferrer(referrer); |
| 887 item->SetTransitionType(transition); | 889 item->SetTransitionType(transition); |
| 888 item->SetIsOverridingUserAgent(useDesktopUserAgent); | 890 item->SetIsOverridingUserAgent(useDesktopUserAgent); |
| 889 item->set_is_renderer_initiated(rendererInitiated); | 891 item->set_is_renderer_initiated(rendererInitiated); |
| 890 return [ | 892 return [ |
| 891 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease]; | 893 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease]; |
| 892 } | 894 } |
| 893 | 895 |
| 894 @end | 896 @end |
| OLD | NEW |