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

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

Issue 2937733003: [CRD iOS] Branching internal and external implementations (Closed)
Patch Set: Move some initialization code to AppDelegate 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..6c4b2fb182ac97c0d27a302b7994b64a9a96fd11 100644
--- a/remoting/ios/app/remoting_view_controller.mm
+++ b/remoting/ios/app/remoting_view_controller.mm
@@ -13,6 +13,7 @@
#import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
#import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
+#import "remoting/ios/app/app_delegate.h"
#import "remoting/ios/app/client_connection_view_controller.h"
#import "remoting/ios/app/host_collection_view_controller.h"
#import "remoting/ios/app/host_view_controller.h"
@@ -76,7 +77,7 @@ static CGFloat kHostInset = 5.f;
self.navigationItem.leftBarButtonItem = menuButton;
UIBarButtonItem* refreshButton = [[UIBarButtonItem alloc]
- initWithImage:[UIImage imageNamed:@"ic_refresh"]
+ initWithImage:[UIImage imageNamed:@"remoting_refresh"]
style:UIBarButtonItemStyleDone
target:self
action:@selector(didSelectRefresh)];
@@ -251,9 +252,8 @@ animationControllerForDismissedController:(UIViewController*)dismissed {
}
- (void)didSelectMenu {
- RemotingMenuViewController* menuViewController =
- [[RemotingMenuViewController alloc] init];
- [self presentViewController:menuViewController animated:YES completion:nil];
+ [AppDelegate.currentDelegate.rootViewController setPanelHidden:NO
+ animated:YES];
}
- (void)presentStatus {

Powered by Google App Engine
This is Rietveld 408576698