diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 00:44:59 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 00:44:59 +0000 |
| commit | ebfe572dddf7774dbf82a88b87821ec11332c466 (patch) | |
| tree | b03d72d63da178a1509e50226b05d5c730014456 /remoting | |
| parent | 46c613965e2f9d97372665cd15a75b6dee21343c (diff) | |
| download | chromium_src-ebfe572dddf7774dbf82a88b87821ec11332c466.zip chromium_src-ebfe572dddf7774dbf82a88b87821ec11332c466.tar.gz chromium_src-ebfe572dddf7774dbf82a88b87821ec11332c466.tar.bz2 | |
Detect if user closes the pref-pane without disabling Chromoting
BUG=129616
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10566013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/me2me_preference_pane.mm | 6 | ||||
| -rw-r--r-- | remoting/host/plugin/daemon_controller_mac.cc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/remoting/host/me2me_preference_pane.mm b/remoting/host/me2me_preference_pane.mm index ac33b13..c360c4b 100644 --- a/remoting/host/me2me_preference_pane.mm +++ b/remoting/host/me2me_preference_pane.mm @@ -327,8 +327,8 @@ std::string JsonHostConfig::GetSerializedData() const { [service_status_timer_ invalidate]; [service_status_timer_ release]; service_status_timer_ = nil; - if (have_new_config_) - [self notifyPlugin:kUpdateFailedNotificationName]; + + [self notifyPlugin:kUpdateFailedNotificationName]; } - (void)applyConfiguration:(id)sender @@ -753,8 +753,6 @@ std::string JsonHostConfig::GetSerializedData() const { NSLog(@"Failed to get path of configuration data."); return; } - if (access(file.c_str(), F_OK) != 0) - return; remove(file.c_str()); [self notifyPlugin:kUpdateFailedNotificationName]; diff --git a/remoting/host/plugin/daemon_controller_mac.cc b/remoting/host/plugin/daemon_controller_mac.cc index 2edd162..4e23458 100644 --- a/remoting/host/plugin/daemon_controller_mac.cc +++ b/remoting/host/plugin/daemon_controller_mac.cc @@ -348,7 +348,7 @@ void DaemonControllerMac::PreferencePaneCallbackDelegate(CFStringRef name) { result = RESULT_OK; } else if (CFStringCompare(name, CFSTR(kUpdateFailedNotificationName), 0) == kCFCompareEqualTo) { - result = RESULT_CANCELLED; + result = RESULT_FAILED; } else { LOG(WARNING) << "Ignoring unexpected notification: " << name; return; |