| 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/chrome/browser/tabs/tab.h" | 5 #import "ios/chrome/browser/tabs/tab.h" |
| 6 | 6 |
| 7 #import <CoreLocation/CoreLocation.h> | 7 #import <CoreLocation/CoreLocation.h> |
| 8 #import <UIKit/UIKit.h> | 8 #import <UIKit/UIKit.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1165 addLocationToNavigationItem:self.currentSessionEntry.navigationItem | 1165 addLocationToNavigationItem:self.currentSessionEntry.navigationItem |
| 1166 browserState:browserState_]; | 1166 browserState:browserState_]; |
| 1167 } | 1167 } |
| 1168 | 1168 |
| 1169 - (void)loadSessionTab:(const sessions::SessionTab*)sessionTab { | 1169 - (void)loadSessionTab:(const sessions::SessionTab*)sessionTab { |
| 1170 DCHECK(sessionTab); | 1170 DCHECK(sessionTab); |
| 1171 [self replaceHistoryWithNavigations:sessionTab->navigations | 1171 [self replaceHistoryWithNavigations:sessionTab->navigations |
| 1172 currentIndex:sessionTab->current_navigation_index]; | 1172 currentIndex:sessionTab->current_navigation_index]; |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 - (void)openJavascript:(NSString*)javaScript { | |
| 1176 DCHECK(javaScript); | |
| 1177 javaScript = [javaScript stringByRemovingPercentEncoding]; | |
| 1178 if (webStateImpl_) | |
| 1179 webStateImpl_->ExecuteJavaScript(base::SysNSStringToUTF16(javaScript)); | |
| 1180 } | |
| 1181 | |
| 1182 - (void)reload { | 1175 - (void)reload { |
| 1183 // TODO(crbug.com/661671): Convert callers to go through CRWWebController | 1176 // TODO(crbug.com/661671): Convert callers to go through CRWWebController |
| 1184 // directly and remove this passthrough method. | 1177 // directly and remove this passthrough method. |
| 1185 [self.webController reload]; | 1178 [self.webController reload]; |
| 1186 } | 1179 } |
| 1187 | 1180 |
| 1188 - (void)webWillReload { | 1181 - (void)webWillReload { |
| 1189 if ([parentTabModel_ tabUsageRecorder]) { | 1182 if ([parentTabModel_ tabUsageRecorder]) { |
| 1190 [parentTabModel_ tabUsageRecorder]->RecordReload(self); | 1183 [parentTabModel_ tabUsageRecorder]->RecordReload(self); |
| 1191 } | 1184 } |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2334 | 2327 |
| 2335 - (TabModel*)parentTabModel { | 2328 - (TabModel*)parentTabModel { |
| 2336 return parentTabModel_; | 2329 return parentTabModel_; |
| 2337 } | 2330 } |
| 2338 | 2331 |
| 2339 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 2332 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
| 2340 return inputAccessoryViewController_.get(); | 2333 return inputAccessoryViewController_.get(); |
| 2341 } | 2334 } |
| 2342 | 2335 |
| 2343 @end | 2336 @end |
| OLD | NEW |