Implement Mac pref-pane UI mockups

remoting/host/me2me_preference_pane.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "remoting/host/me2me_preference_pane.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CommonCrypto/CommonHMAC.h>
 #include <launch.h>
 #import <PreferencePanes/PreferencePanes.h>
 #import <SecurityInterface/SFAuthorizationView.h>
 #include <unistd.h>
 
 #include <fstream>
 
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/mac/authorization_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launchd.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_launch_data.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "remoting/host/host_config.h"
+#import "remoting/host/me2me_preference_pane_confirm_pin.h"
+#import "remoting/host/me2me_preference_pane_disable.h"
 #include "third_party/jsoncpp/source/include/json/reader.h"
 #include "third_party/jsoncpp/source/include/json/writer.h"
 #include "third_party/modp_b64/modp_b64.h"
 
 namespace {
 // The name of the Remoting Host service that is registered with launchd.
 #define kServiceName "org.chromium.chromoting"
 
 // Use separate named notifications for success and failure because sandboxed
 // components can't include a dictionary when sending distributed notifications.
@@ skipping 108 matching lines @@
 }
 
 }  // namespace remoting
 
 @implementation Me2MePreferencePane
 
 - (void)mainViewDidLoad {
   [authorization_view_ setDelegate:self];
   [authorization_view_ setString:kAuthorizationRightExecute];
   [authorization_view_ setAutoupdate:YES];
+  confirm_pin_view_ = [[Me2MePreferencePaneConfirmPin alloc] init];

[dcaiafa, 2012/05/21 15:45:31]

Leak in non-GC environment. I'd move the alloc/inits to the init method, and
place releases in the dealloc method.

+  [confirm_pin_view_ setDelegate:self];
+  disable_view_ = [[Me2MePreferencePaneDisable alloc] init];
+  [disable_view_ setDelegate:self];
 }
 
 - (void)willSelect {
   have_new_config_ = NO;
 
   NSDistributedNotificationCenter* center =
       [NSDistributedNotificationCenter defaultCenter];
   [center addObserver:self
              selector:@selector(onNewConfigFile:)
                  name:@kServiceName
@@ skipping 17 matching lines @@
   [center removeObserver:self];
 
   [service_status_timer_ invalidate];
   [service_status_timer_ release];
   service_status_timer_ = nil;
   if (have_new_config_) {
     [self notifyPlugin: kUpdateFailedNotificationName];
   }
 }
 
-- (void)onApply:(id)sender {
+- (void)applyConfiguration:(id)sender
+                       pin:(NSString*)pin {
   if (!have_new_config_) {
     // It shouldn't be possible to hit the button if there is no config to
     // apply, but check anyway just in case it happens somehow.
     return;
   }
 
   // Ensure the authorization token is up-to-date before using it.
   [self updateAuthorizationStatus];
   [self updateUI];
 
-  std::string pin = base::SysNSStringToUTF8([pin_ stringValue]);
+  std::string pin_utf8 = base::SysNSStringToUTF8(pin);
   std::string host_id, host_secret_hash;
   bool result = (config_->GetString(remoting::kHostIdConfigPath, &host_id) &&
                  config_->GetString(remoting::kHostSecretHashConfigPath,
                                     &host_secret_hash));
   DCHECK(result);
-  if (!IsPinValid(pin, host_id, host_secret_hash)) {
+  if (!IsPinValid(pin_utf8, host_id, host_secret_hash)) {
     [self showIncorrectPinMessage];
     return;
   }
 
   [self applyNewServiceConfig];
   [self updateUI];
 }
 
 - (void)onDisable:(id)sender {
   // Ensure the authorization token is up-to-date before using it.
@@ skipping 66 matching lines @@
   }
   remove(file.c_str());
   if (!IsConfigValid(new_config_.get())) {
     LOG(ERROR) << "Invalid configuration data read.";
     [self showError];
     return;
   }
 
   config_.swap(new_config_);
   have_new_config_ = YES;
+
+  [confirm_pin_view_ resetPin];
 }
 
 - (void)updateUI {
-  // TODO(lambroslambrou): These strings should be localized.
-#ifdef OFFICIAL_BUILD
-  NSString* name = @"Chrome Remote Desktop";
-#else
-  NSString* name = @"Chromoting";
-#endif
+  if (have_new_config_) {
+    [box_ setContentView:[confirm_pin_view_ view]];
+  } else {
+    [box_ setContentView:[disable_view_ view]];
+  }
+
+  // TODO(lambroslambrou): Show "enabled" and "disabled" in bold font.
   NSString* message;
   if (is_service_running_) {
-    message = [NSString stringWithFormat:@"%@ is enabled", name];
+    if (have_new_config_) {
+      message = @"Please confirm your new PIN.";
+    } else {
+      message = @"Remote connections to this computer are enabled.";
+    }
   } else {
-    message = [NSString stringWithFormat:@"%@ is disabled", name];
+    if (have_new_config_) {
+      message = @"Remote connections to this computer are disabled. To enable "
+          "remote connections you must confirm your PIN.";
+    } else {
+      message = @"Remote connections to this computer are disabled.";
+    }
   }
   [status_message_ setStringValue:message];
 
   std::string email;
   if (config_.get()) {
     bool result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
 
     // The config has already been checked by |IsConfigValid|.
     DCHECK(result);
   }
-  [email_ setStringValue:base::SysUTF8ToNSString(email)];
 
-  [disable_button_ setEnabled:(is_pane_unlocked_ && is_service_running_)];
-  [pin_instruction_message_ setEnabled:have_new_config_];
-  [email_ setEnabled:have_new_config_];
-  [pin_ setEnabled:have_new_config_];
-  [apply_button_ setEnabled:(is_pane_unlocked_ && have_new_config_)];
+  [disable_view_ setEnabled:(is_pane_unlocked_ && is_service_running_)];
+  [confirm_pin_view_ setEnabled:is_pane_unlocked_];
+  [confirm_pin_view_ setEmail:base::SysUTF8ToNSString(email)];
+  NSString* applyButtonText = is_service_running_ ? @"Confirm" : @"Enable";
+  [confirm_pin_view_ setButtonText:applyButtonText];
 }
 
 - (void)showError {
   NSAlert* alert = [[NSAlert alloc] init];
   [alert setMessageText:@"An unexpected error occurred."];
   [alert setInformativeText:@"Check the system log for more information."];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert beginSheetModalForWindow:[[self mainView] window]
                     modalDelegate:nil
                    didEndSelector:nil
@@ skipping 154 matching lines @@
 - (void)notifyPlugin:(const char*)message {
   NSDistributedNotificationCenter* center =
       [NSDistributedNotificationCenter defaultCenter];
   NSString* name = [NSString stringWithUTF8String:message];
   [center postNotificationName:name
                         object:nil
                       userInfo:nil];
 }
 
 @end