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

Unified Diff: remoting/ios/app/remoting_view_controller.mm

Issue 2937733003: [CRD iOS] Branching internal and external implementations (Closed)
Patch Set: Merge w/ ToT Created 3 years, 6 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: remoting/ios/app/remoting_view_controller.mm
diff --git a/remoting/ios/app/remoting_view_controller.mm b/remoting/ios/app/remoting_view_controller.mm
index ec7b1daf753533f10c39e23b9b065719f9b7477a..fbbe6190f5da63fc8d14c5f26113be76cde86d11 100644
--- a/remoting/ios/app/remoting_view_controller.mm
+++ b/remoting/ios/app/remoting_view_controller.mm
@@ -17,6 +17,7 @@
#import "remoting/ios/app/host_collection_view_controller.h"
#import "remoting/ios/app/host_view_controller.h"
#import "remoting/ios/app/remoting_menu_view_controller.h"
+#import "remoting/ios/app/remoting_resource_factory.h"
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/domain/client_session_details.h"
#import "remoting/ios/facade/remoting_authentication.h"
@@ -76,7 +77,7 @@ static CGFloat kHostInset = 5.f;
self.navigationItem.leftBarButtonItem = menuButton;
UIBarButtonItem* refreshButton = [[UIBarButtonItem alloc]
- initWithImage:[UIImage imageNamed:@"ic_refresh"]
nicholss 2017/06/14 15:37:59 why are you renaming this asset?
+ initWithImage:[UIImage imageNamed:@"remoting_refresh"]
style:UIBarButtonItemStyleDone
target:self
action:@selector(didSelectRefresh)];
@@ -251,9 +252,7 @@ animationControllerForDismissedController:(UIViewController*)dismissed {
}
- (void)didSelectMenu {
- RemotingMenuViewController* menuViewController =
- [[RemotingMenuViewController alloc] init];
- [self presentViewController:menuViewController animated:YES completion:nil];
+ [RemotingResourceFactory.defaultFactory presentMenuOnController:self];
}
- (void)presentStatus {

Powered by Google App Engine
This is Rietveld 408576698