| 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 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" | 5 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #import "base/ios/weak_nsobject.h" | 9 #import "base/ios/weak_nsobject.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 #pragma mark - BookmarkHomeViewControllerDelegate | 288 #pragma mark - BookmarkHomeViewControllerDelegate |
| 289 | 289 |
| 290 - (void)bookmarkHomeViewControllerWantsDismissal: | 290 - (void)bookmarkHomeViewControllerWantsDismissal: |
| 291 (BookmarkHomeViewController*)controller | 291 (BookmarkHomeViewController*)controller |
| 292 navigationToUrl:(const GURL&)url { | 292 navigationToUrl:(const GURL&)url { |
| 293 [self dismissBookmarkBrowserAnimated:YES]; | 293 [self dismissBookmarkBrowserAnimated:YES]; |
| 294 | 294 |
| 295 if (url != GURL()) { | 295 if (url != GURL()) { |
| 296 new_tab_page_uma::RecordAction(_browserState, | 296 new_tab_page_uma::RecordAction(_browserState, |
| 297 new_tab_page_uma::ACTION_OPENED_BOOKMARK); | 297 new_tab_page_uma::ACTION_OPENED_BOOKMARK); |
| 298 base::RecordAction(base::UserMetricsAction("MobileNTPBookmark")); | 298 base::RecordAction( |
| 299 base::UserMetricsAction("MobileBookmarkManagerEntryOpened")); |
| 299 | 300 |
| 300 if (url.SchemeIs(url::kJavaScriptScheme)) { // bookmarklet | 301 if (url.SchemeIs(url::kJavaScriptScheme)) { // bookmarklet |
| 301 NSString* jsToEval = [base::SysUTF8ToNSString(url.GetContent()) | 302 NSString* jsToEval = [base::SysUTF8ToNSString(url.GetContent()) |
| 302 stringByRemovingPercentEncoding]; | 303 stringByRemovingPercentEncoding]; |
| 303 [_loader loadJavaScriptFromLocationBar:jsToEval]; | 304 [_loader loadJavaScriptFromLocationBar:jsToEval]; |
| 304 } else { | 305 } else { |
| 305 [_loader loadURL:url | 306 [_loader loadURL:url |
| 306 referrer:web::Referrer() | 307 referrer:web::Referrer() |
| 307 transition:ui::PAGE_TRANSITION_AUTO_BOOKMARK | 308 transition:ui::PAGE_TRANSITION_AUTO_BOOKMARK |
| 308 rendererInitiated:NO]; | 309 rendererInitiated:NO]; |
| 309 } | 310 } |
| 310 } | 311 } |
| 311 } | 312 } |
| 312 | 313 |
| 313 @end | 314 @end |
| OLD | NEW |