Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2611673002: Moves overscroll code out of the ios_internal namespace. (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/tabs/tab.mm ('k') | ios/chrome/browser/ui/fullscreen_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 4ec12ad0a69b7f82090ea76a2c9c1edbb2958879..663810736aade11d923e3ecf04676f57e366edd0 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -2752,10 +2752,9 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
initWithScrollView:[nativeContent scrollView]] autorelease];
[[nativeContent scrollView] setDelegate:controller];
[controller setDelegate:self];
- ios_internal::OverscrollStyle style =
- _isOffTheRecord
- ? ios_internal::OverscrollStyle::REGULAR_PAGE_INCOGNITO
- : ios_internal::OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO;
+ OverscrollStyle style = _isOffTheRecord
+ ? OverscrollStyle::REGULAR_PAGE_INCOGNITO
+ : OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO;
controller.style = style;
nativeContent.overscrollActionsController = controller;
}
@@ -2764,22 +2763,22 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
#pragma mark - OverscrollActionsControllerDelegate methods.
- (void)overscrollActionsController:(OverscrollActionsController*)controller
- didTriggerAction:(ios_internal::OverscrollAction)action {
+ didTriggerAction:(OverscrollAction)action {
switch (action) {
- case ios_internal::OverscrollAction::NEW_TAB:
+ case OverscrollAction::NEW_TAB:
[self newTab:nil];
break;
- case ios_internal::OverscrollAction::CLOSE_TAB:
+ case OverscrollAction::CLOSE_TAB:
[self closeCurrentTab];
break;
- case ios_internal::OverscrollAction::REFRESH:
+ case OverscrollAction::REFRESH:
if ([[[_model currentTab] webController] loadPhase] ==
web::PAGE_LOADING) {
[[_model currentTab] stopLoading];
}
[[_model currentTab] reload];
break;
- case ios_internal::OverscrollAction::NONE:
+ case OverscrollAction::NONE:
NOTREACHED();
break;
}
« no previous file with comments | « ios/chrome/browser/tabs/tab.mm ('k') | ios/chrome/browser/ui/fullscreen_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698