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

Unified Diff: remoting/host/mac/me2me_preference_pane.mm

Issue 23995027: Show host owner rather than xmpp login on the UI where available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make email logic explicit. Created 7 years, 3 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 | « no previous file | remoting/host/win/elevated_controller.cc » ('j') | remoting/host/win/elevated_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/mac/me2me_preference_pane.mm
diff --git a/remoting/host/mac/me2me_preference_pane.mm b/remoting/host/mac/me2me_preference_pane.mm
index 3d0879bcc60ab0a315d8de5674dae9e3ffd033f5..56cc235e847ee5920dc79c30f9be82a242e3adef 100644
--- a/remoting/host/mac/me2me_preference_pane.mm
+++ b/remoting/host/mac/me2me_preference_pane.mm
@@ -468,12 +468,15 @@ std::string JsonHostConfig::GetSerializedData() const {
std::string email;
if (config_.get()) {
- bool result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
-
- // The config has already been checked by |IsConfigValid|.
+ bool result = config_->GetString(remoting::kHostOwnerConfigPath, &email);
if (!result) {
- [self showError];
- return;
+ result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
+
+ // The config has already been checked by |IsConfigValid|.
+ if (!result) {
+ [self showError];
+ return;
+ }
}
}
[disable_view_ setEnabled:(is_pane_unlocked_ && is_service_running_ &&
« no previous file with comments | « no previous file | remoting/host/win/elevated_controller.cc » ('j') | remoting/host/win/elevated_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698