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

Unified Diff: ios/chrome/browser/ui/ntp/google_landing_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
Index: ios/chrome/browser/ui/ntp/google_landing_controller.mm
diff --git a/ios/chrome/browser/ui/ntp/google_landing_controller.mm b/ios/chrome/browser/ui/ntp/google_landing_controller.mm
index 2e59132647a2eda4df229d1ee9b0867c6bd0e182..edec1eab443e8cca6876fc08e4ae54c5f2e64378 100644
--- a/ios/chrome/browser/ui/ntp/google_landing_controller.mm
+++ b/ios/chrome/browser/ui/ntp/google_landing_controller.mm
@@ -949,8 +949,7 @@ void SearchEngineObserver::OnTemplateURLServiceChanged() {
if (!IsIPadIdiom()) {
_overscrollActionsController.reset([[OverscrollActionsController alloc]
initWithScrollView:_mostVisitedView]);
- [_overscrollActionsController
- setStyle:ios_internal::OverscrollStyle::NTP_NON_INCOGNITO];
+ [_overscrollActionsController setStyle:OverscrollStyle::NTP_NON_INCOGNITO];
[_overscrollActionsController setDelegate:self];
}
}
@@ -1687,22 +1686,22 @@ void SearchEngineObserver::OnTemplateURLServiceChanged() {
#pragma mark - OverscrollActionsControllerDelegate
- (void)overscrollActionsController:(OverscrollActionsController*)controller
- didTriggerAction:(ios_internal::OverscrollAction)action {
+ didTriggerAction:(OverscrollAction)action {
switch (action) {
- case ios_internal::OverscrollAction::NEW_TAB: {
+ case OverscrollAction::NEW_TAB: {
base::scoped_nsobject<GenericChromeCommand> command(
[[GenericChromeCommand alloc] initWithTag:IDC_NEW_TAB]);
[[self view] chromeExecuteCommand:command];
} break;
- case ios_internal::OverscrollAction::CLOSE_TAB: {
+ case OverscrollAction::CLOSE_TAB: {
base::scoped_nsobject<GenericChromeCommand> command(
[[GenericChromeCommand alloc] initWithTag:IDC_CLOSE_TAB]);
[[self view] chromeExecuteCommand:command];
} break;
- case ios_internal::OverscrollAction::REFRESH:
+ case OverscrollAction::REFRESH:
[self reload];
break;
- case ios_internal::OverscrollAction::NONE:
+ case OverscrollAction::NONE:
NOTREACHED();
break;
}

Powered by Google App Engine
This is Rietveld 408576698