From c74d46b9e3d21e4e9c51814d22553dd8e540b458 Mon Sep 17 00:00:00 2001 From: "lambroslambrou@chromium.org" Date: Tue, 22 May 2012 22:35:52 +0000 Subject: Merge 138322 - Implement Mac pref-pane UI mockups This updates the screens to match the mockups. There are two new nib files. One is a view with just a disable button. The other is a view with the PIN-confirmation controls. The main nib has been updated to remove all controls except for the Status text and the padlock. A new placeholder box has been added in the middle of the window, which can show either of the new nibs, depending on whether a new config has been received by the pref-pane. This also fixes some small issues: PIN is reset whenever a new config is sent to the pref-pane - this prevents the previous PIN dots being shown if the user changes PIN a second time without closing the System Preferences applet. The PIN entry box is disabled until the pane is unlocked, for a slightly improved UX. BUG=128813,129032 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10411032 TBR=lambroslambrou@chromium.org Review URL: https://chromiumcodereview.appspot.com/10408076 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138378 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/host/me2me_preference_pane.h | 17 +- remoting/host/me2me_preference_pane.mm | 52 +- remoting/host/me2me_preference_pane.xib | 640 +++++------ remoting/host/me2me_preference_pane_confirm_pin.h | 26 + remoting/host/me2me_preference_pane_confirm_pin.mm | 44 + .../host/me2me_preference_pane_confirm_pin.xib | 1167 ++++++++++++++++++++ remoting/host/me2me_preference_pane_disable.h | 20 + remoting/host/me2me_preference_pane_disable.mm | 30 + remoting/host/me2me_preference_pane_disable.xib | 922 ++++++++++++++++ remoting/remoting.gyp | 6 + 10 files changed, 2566 insertions(+), 358 deletions(-) create mode 100644 remoting/host/me2me_preference_pane_confirm_pin.h create mode 100644 remoting/host/me2me_preference_pane_confirm_pin.mm create mode 100644 remoting/host/me2me_preference_pane_confirm_pin.xib create mode 100644 remoting/host/me2me_preference_pane_disable.h create mode 100644 remoting/host/me2me_preference_pane_disable.mm create mode 100644 remoting/host/me2me_preference_pane_disable.xib diff --git a/remoting/host/me2me_preference_pane.h b/remoting/host/me2me_preference_pane.h index 2ed986e..54b068a 100644 --- a/remoting/host/me2me_preference_pane.h +++ b/remoting/host/me2me_preference_pane.h @@ -14,13 +14,15 @@ namespace remoting { class JsonHostConfig; } +@class Me2MePreferencePaneConfirmPin; +@class Me2MePreferencePaneDisable; + @interface Me2MePreferencePane : NSPreferencePane { + Me2MePreferencePaneConfirmPin* confirm_pin_view_; + Me2MePreferencePaneDisable* disable_view_; + IBOutlet NSTextField* status_message_; - IBOutlet NSButton* disable_button_; - IBOutlet NSTextField* pin_instruction_message_; - IBOutlet NSTextField* email_; - IBOutlet NSTextField* pin_; - IBOutlet NSButton* apply_button_; + IBOutlet NSBox* box_; IBOutlet SFAuthorizationView* authorization_view_; // Holds the new proposed configuration if a temporary config file is @@ -41,8 +43,9 @@ class JsonHostConfig; - (void)mainViewDidLoad; - (void)willSelect; - (void)willUnselect; -- (IBAction)onDisable:(id)sender; -- (IBAction)onApply:(id)sender; +- (void)onDisable:(id)sender; +- (void)applyConfiguration:(id)sender + pin:(NSString*)pin; - (void)onNewConfigFile:(NSNotification*)notification; - (void)refreshServiceStatus:(NSTimer*)timer; - (void)authorizationViewDidAuthorize:(SFAuthorizationView*)view; diff --git a/remoting/host/me2me_preference_pane.mm b/remoting/host/me2me_preference_pane.mm index 7ae7c25..0252d04 100644 --- a/remoting/host/me2me_preference_pane.mm +++ b/remoting/host/me2me_preference_pane.mm @@ -23,6 +23,8 @@ #include "base/sys_string_conversions.h" #include "remoting/host/host_config.h" #include "remoting/host/json_host_config.h" +#import "remoting/host/me2me_preference_pane_confirm_pin.h" +#import "remoting/host/me2me_preference_pane_disable.h" #include "remoting/protocol/me2me_host_authenticator_factory.h" namespace { @@ -78,6 +80,10 @@ bool IsPinValid(const std::string& pin, const std::string& host_id, [authorization_view_ setDelegate:self]; [authorization_view_ setString:kAuthorizationRightExecute]; [authorization_view_ setAutoupdate:YES]; + confirm_pin_view_ = [[Me2MePreferencePaneConfirmPin alloc] init]; + [confirm_pin_view_ setDelegate:self]; + disable_view_ = [[Me2MePreferencePaneDisable alloc] init]; + [disable_view_ setDelegate:self]; } - (void)willSelect { @@ -115,7 +121,8 @@ bool IsPinValid(const std::string& pin, const std::string& host_id, } } -- (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. @@ -126,13 +133,13 @@ bool IsPinValid(const std::string& pin, const std::string& host_id, [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; } @@ -222,20 +229,32 @@ bool IsPinValid(const std::string& pin, const std::string& host_id, 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]; @@ -246,13 +265,12 @@ bool IsPinValid(const std::string& pin, const std::string& host_id, // 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 { diff --git a/remoting/host/me2me_preference_pane.xib b/remoting/host/me2me_preference_pane.xib index f433f2d..3497984 100644 --- a/remoting/host/me2me_preference_pane.xib +++ b/remoting/host/me2me_preference_pane.xib @@ -10,7 +10,9 @@ com.apple.InterfaceBuilder.CocoaPlugin 851 - + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -31,7 +33,7 @@ 7 2 - {{176, 715}, {667, 292}} + {{176, 764}, {667, 243}} 1081606144 << do not localize >> NSWindow @@ -41,156 +43,98 @@ {1.79769e+308, 1.79769e+308} {224.664, 10} - + 256 - + - 298 - {{293, 88}, {82, 32}} + 303 + {{20, 20}, {627, 47}} - YES - - 604110336 - 134217728 - Apply - - LucidaGrande - 13 - 1044 - - - -2038284033 - 129 - - - 200 - 25 - + SFAuthorizationView - + - 298 - {{87, 154}, {494, 17}} + 12 + + + + 256 + {633, 106} + + + + {{17, 71}, {633, 106}} - YES - - 68288064 - 138413056 - email - - - + {0, 0} + + 67239424 + 0 + Box + + LucidaGrande + 11 + 3100 + + 6 System - controlColor + textBackgroundColor 3 - MC42NjY2NjY2NjY3AA + MQA - - 6 - System - controlTextColor - - 3 - MAA - + + 3 + MCAwLjgwMDAwMDAxMTkAA + + 0 + 0 + 0 + NO - + - 298 - {{240, 124}, {187, 22}} + 268 + {{17, 183}, {633, 40}} YES - - -1804468671 - 272630784 - - - - YES + + 67239424 + 4456448 + Status + + LucidaGrande + 13 + 16 + + 6 System - textBackgroundColor + controlColor 3 - MQA + MC42NjY2NjY2NjY3AA 6 System - textColor - + controlTextColor + + 3 + MAA + - - - 303 - {{20, 20}, {627, 47}} - - SFAuthorizationView - - - - 298 - {{86, 255}, {494, 17}} - - YES - - 68288064 - 138413056 - Status text - - - - - - - - - 298 - {{86, 179}, {494, 17}} - - YES - - 68288064 - 138413056 - Please confirm PIN for user: - - - - - - - - - 268 - {{240, 219}, {186, 32}} - - YES - - 604110336 - 134217728 - Disable Remote Access - - - -2038284033 - 129 - - - 200 - 25 - - - {667, 292} + {667, 243} + {{0, 0}, {2560, 1578}} {224.664, 32} @@ -217,67 +161,19 @@ - status_message_ - - - - 111 - - - - email_ + box_ - + - 114 + 126 - apply_button_ - - - - 115 - - - - onApply: - - - - 116 - - - - pin_ - - - - 117 - - - - disable_button_ - - - - 120 - - - - pin_instruction_message_ - - - - 121 - - - - onDisable: + status_message_ - + - 122 + 127 @@ -313,13 +209,9 @@ 6 - + - - - - - + @@ -330,87 +222,27 @@ Application - 99 - - - - - - - - 100 - - - - - 101 - - - - - - - - 102 - - - - - 103 - - - - - - - - 104 - - - - 105 - 109 - - - - + 123 + - 110 - - - - - 112 - - - - - - - - 113 - - - - - 118 - + 124 + - + - 119 - - + 125 + + @@ -418,85 +250,58 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NSSecureTextFieldCell - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{0, 1253}, {668, 292}} + + AUGgAABBoAAAA + + {{1424, 1107}, {667, 243}} com.apple.InterfaceBuilder.CocoaPlugin - {{0, 1253}, {668, 292}} + {{1424, 1107}, {667, 243}} {224.664, 10} + com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABC8AAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 122 + 127 Me2MePreferencePane NSPreferencePane - - id - id - - - - onApply: - id - - + + onDisable: + id + + + onDisable: + onDisable: id - + - NSButton SFAuthorizationView - NSButton - NSTextField - NSTextField - NSTextField + NSBox NSTextField - - apply_button_ - NSButton - authorization_view_ SFAuthorizationView - - disable_button_ - NSButton - - - email_ - NSTextField - - - pin_ - NSTextField - - - pin_instruction_message_ - NSTextField + + box_ + NSBox status_message_ @@ -562,26 +367,11 @@ - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell + NSBox + NSView IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h + AppKit.framework/Headers/NSBox.h @@ -625,6 +415,20 @@ NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAlert.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAnimation.h + + + + NSObject @@ -633,16 +437,44 @@ NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSObject NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBox.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBoxCell.h + + + + NSObject NSObject IBFrameworkSource + AppKit.framework/Headers/NSDatePickerCell.h + + + + NSObject + + IBFrameworkSource AppKit.framework/Headers/NSDictionaryController.h @@ -655,6 +487,13 @@ NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSObject IBFrameworkSource AppKit.framework/Headers/NSFontManager.h @@ -671,6 +510,13 @@ NSObject IBFrameworkSource + AppKit.framework/Headers/NSImage.h + + + + NSObject + + IBFrameworkSource AppKit.framework/Headers/NSKeyValueBinding.h @@ -703,6 +549,13 @@ NSObject IBFrameworkSource + AppKit.framework/Headers/NSRuleEditor.h + + + + NSObject + + IBFrameworkSource AppKit.framework/Headers/NSSavePanel.h @@ -710,6 +563,41 @@ NSObject IBFrameworkSource + AppKit.framework/Headers/NSSound.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechRecognizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechSynthesizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSObject + + IBFrameworkSource AppKit.framework/Headers/NSTableView.h @@ -717,6 +605,48 @@ NSObject IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextStorage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenField.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenFieldCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSObject + + IBFrameworkSource AppKit.framework/Headers/NSToolbarItem.h @@ -729,6 +659,13 @@ NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSObject IBFrameworkSource Foundation.framework/Headers/NSArchiver.h @@ -745,6 +682,13 @@ NSObject IBFrameworkSource + Foundation.framework/Headers/NSConnection.h + + + + NSObject + + IBFrameworkSource Foundation.framework/Headers/NSError.h @@ -780,6 +724,20 @@ NSObject IBFrameworkSource + Foundation.framework/Headers/NSMetadata.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource Foundation.framework/Headers/NSObject.h @@ -794,6 +752,13 @@ NSObject IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource Foundation.framework/Headers/NSPortCoder.h @@ -836,6 +801,20 @@ NSObject IBFrameworkSource + Foundation.framework/Headers/NSSpellServer.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource Foundation.framework/Headers/NSThread.h @@ -864,7 +843,14 @@ NSObject IBFrameworkSource - QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + Print.framework/Headers/PDEPluginInterface.h @@ -957,14 +943,6 @@ - NSSecureTextFieldCell - NSTextFieldCell - - IBFrameworkSource - AppKit.framework/Headers/NSSecureTextField.h - - - NSTextField NSControl @@ -1008,18 +986,12 @@ NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - + NSWindow NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - + NSWindow @@ -1038,7 +1010,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES ../remoting.xcodeproj diff --git a/remoting/host/me2me_preference_pane_confirm_pin.h b/remoting/host/me2me_preference_pane_confirm_pin.h new file mode 100644 index 0000000..f16ada3 --- /dev/null +++ b/remoting/host/me2me_preference_pane_confirm_pin.h @@ -0,0 +1,26 @@ +// 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 + +@protocol Me2MePreferencePaneConfirmPinHandler +- (void)applyConfiguration:(id)sender pin:(NSString*)pin; +@end + +@interface Me2MePreferencePaneConfirmPin : NSViewController { + IBOutlet NSTextField* email_; + IBOutlet NSTextField* pin_; + IBOutlet NSButton* apply_button_; + id delegate_; +} + +@property (retain) id delegate; + +- (void)setEmail:(NSString*)email; +- (void)setButtonText:(NSString*)text; +- (void)setEnabled:(BOOL)enabled; +- (void)resetPin; +- (IBAction)onApply:(id)sender; + +@end diff --git a/remoting/host/me2me_preference_pane_confirm_pin.mm b/remoting/host/me2me_preference_pane_confirm_pin.mm new file mode 100644 index 0000000..1c091c9 --- /dev/null +++ b/remoting/host/me2me_preference_pane_confirm_pin.mm @@ -0,0 +1,44 @@ +// 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 "me2me_preference_pane_confirm_pin.h" + +@implementation Me2MePreferencePaneConfirmPin + +@synthesize delegate = delegate_; + +- (id)init { + self = [super initWithNibName:@"me2me_preference_pane_confirm_pin" + bundle:[NSBundle bundleForClass:[self class]]]; + return self; +} + +- (void)dealloc { + [delegate_ release]; + [super dealloc]; +} + +- (void)setEmail:(NSString*)email { + [email_ setStringValue:email]; +} + +- (void)setButtonText:(NSString*)text { + [apply_button_ setTitle:text]; +} + +- (void)setEnabled:(BOOL)enabled { + [apply_button_ setEnabled:enabled]; + [pin_ setEnabled:enabled]; +} + +- (void)resetPin { + [pin_ setStringValue:@""]; +} + +- (void)onApply:(id)sender { + [delegate_ applyConfiguration:self + pin:[pin_ stringValue]]; +} + +@end diff --git a/remoting/host/me2me_preference_pane_confirm_pin.xib b/remoting/host/me2me_preference_pane_confirm_pin.xib new file mode 100644 index 0000000..660ab1e --- /dev/null +++ b/remoting/host/me2me_preference_pane_confirm_pin.xib @@ -0,0 +1,1167 @@ + + + + 1050 + 10K549 + 851 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 851 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + Me2MePreferencePaneConfirmPin + + + FirstResponder + + + NSApplication + + + + 268 + + YES + + + 268 + {{413, 37}, {98, 25}} + + YES + + -2080244224 + 134217728 + Apply + + LucidaGrande + 13 + 1044 + + + -2038152961 + 163 + + + 400 + 75 + + + + + 268 + {{217, 39}, {188, 22}} + + YES + + 343014976 + 272630784 + + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + 3 + MAA + + + + YES + NSAllRomanInputSourcesLocaleIdentifier + + + + + + 268 + {{17, 44}, {195, 17}} + + YES + + 68288064 + 71304192 + PIN: + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + + + + 268 + {{214, 69}, {402, 17}} + + YES + + 68288064 + 4195328 + username + + + + + + + + + 268 + {{17, 69}, {195, 17}} + + YES + + 68288064 + 71304192 + User: + + + + + + + + {633, 106} + + NSCustomView + + + + + YES + + + email_ + + + + 15 + + + + pin_ + + + + 16 + + + + view + + + + 18 + + + + onApply: + + + + 21 + + + + apply_button_ + + + + 22 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + + + + + + + 4 + + + YES + + + + + + 5 + + + + + 6 + + + YES + + + + + + 7 + + + + + 8 + + + YES + + + + + + 9 + + + + + 10 + + + YES + + + + + + 11 + + + + + 19 + + + YES + + + + + + 20 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 10.IBPluginDependency + 11.IBPluginDependency + 19.IBPluginDependency + 19.IBViewBoundsToFrameTransform + 20.IBPluginDependency + 4.IBPluginDependency + 4.IBViewBoundsToFrameTransform + 5.IBPluginDependency + 6.IBPluginDependency + 6.IBViewBoundsToFrameTransform + 7.IBPluginDependency + 8.IBPluginDependency + 8.IBViewBoundsToFrameTransform + 9.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{169, 1310}, {633, 106}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD6gAAwnAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwqgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBsAAAwp4AAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDVgAAwqgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 22 + + + + YES + + Me2MePreferencePaneConfirmPin + NSViewController + + onApply: + id + + + onApply: + + onApply: + id + + + + YES + + YES + apply_button_ + delegate_ + email_ + pin_ + + + YES + NSButton + id + NSTextField + NSTextField + + + + YES + + YES + apply_button_ + delegate_ + email_ + pin_ + + + YES + + apply_button_ + NSButton + + + delegate_ + id + + + email_ + NSTextField + + + pin_ + NSTextField + + + + + IBProjectSource + host/me2me_preference_pane_confirm_pin.h + + + + NSObject + + IBProjectSource + ../third_party/GTM/AppKit/GTMCarbonEvent.h + + + + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAlert.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAnimation.h + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBox.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBoxCell.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDatePickerCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSImage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSRuleEditor.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSound.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechRecognizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechSynthesizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextStorage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenField.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenFieldCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSMetadata.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSSpellServer.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + Print.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureFileOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureView.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovie.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovieView.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSSecureTextField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSecureTextField.h + + + + NSSecureTextFieldCell + NSTextFieldCell + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSViewController + NSResponder + + view + NSView + + + view + + view + NSView + + + + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../remoting.xcodeproj + 3 + + diff --git a/remoting/host/me2me_preference_pane_disable.h b/remoting/host/me2me_preference_pane_disable.h new file mode 100644 index 0000000..9871e7c --- /dev/null +++ b/remoting/host/me2me_preference_pane_disable.h @@ -0,0 +1,20 @@ +// 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 + +// This view-controller holds just a "Disable" button. It is shown when the +// pref-pane is launched manually, or when the user has just confirmed their +// PIN and applied a new configuration. +@interface Me2MePreferencePaneDisable : NSViewController { + IBOutlet NSButton* disable_button_; + id delegate_; +} + +@property (retain) id delegate; + +- (void)setEnabled:(BOOL)enabled; +- (IBAction)onDisable:(id)sender; + +@end diff --git a/remoting/host/me2me_preference_pane_disable.mm b/remoting/host/me2me_preference_pane_disable.mm new file mode 100644 index 0000000..97bf355 --- /dev/null +++ b/remoting/host/me2me_preference_pane_disable.mm @@ -0,0 +1,30 @@ +// 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 "me2me_preference_pane_disable.h" + +@implementation Me2MePreferencePaneDisable + +@synthesize delegate = delegate_; + +- (id)init { + self = [super initWithNibName:@"me2me_preference_pane_disable" + bundle:[NSBundle bundleForClass:[self class]]]; + return self; +} + +- (void)dealloc { + [delegate_ release]; + [super dealloc]; +} + +- (void)setEnabled:(BOOL)enabled { + [disable_button_ setEnabled:enabled]; +} + +- (void)onDisable:(id)sender { + [delegate_ onDisable:self]; +} + +@end diff --git a/remoting/host/me2me_preference_pane_disable.xib b/remoting/host/me2me_preference_pane_disable.xib new file mode 100644 index 0000000..ab30b5f --- /dev/null +++ b/remoting/host/me2me_preference_pane_disable.xib @@ -0,0 +1,922 @@ + + + + 1050 + 10K549 + 851 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 851 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + Me2MePreferencePaneDisable + + + FirstResponder + + + NSApplication + + + + 268 + + YES + + + 268 + {{200, 62}, {232, 25}} + + YES + + -2080244224 + 134217728 + Disable Remote Connections + + LucidaGrande + 13 + 1044 + + + -2038152961 + 163 + + + 400 + 75 + + + + {633, 106} + + NSCustomView + + + + + YES + + + view + + + + 16 + + + + disable_button_ + + + + 21 + + + + onDisable: + + + + 22 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + + + 19 + + + YES + + + + + + 20 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 19.IBPluginDependency + 19.IBViewBoundsToFrameTransform + 20.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{611, 494}, {633, 106}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDSAAAwnwAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 22 + + + + YES + + Me2MePreferencePaneDisable + NSViewController + + onDisable: + id + + + onDisable: + + onDisable: + id + + + + YES + + YES + delegate_ + disable_button_ + + + YES + id + NSButton + + + + YES + + YES + delegate_ + disable_button_ + + + YES + + delegate_ + id + + + disable_button_ + NSButton + + + + + IBProjectSource + host/me2me_preference_pane_disable.h + + + + NSObject + + IBProjectSource + ../third_party/GTM/AppKit/GTMCarbonEvent.h + + + + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAlert.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAnimation.h + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBox.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBoxCell.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDatePickerCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSImage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSRuleEditor.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSound.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechRecognizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechSynthesizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextStorage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenField.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenFieldCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSMetadata.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSSpellServer.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + Print.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureFileOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureView.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovie.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovieView.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSViewController + NSResponder + + view + NSView + + + view + + view + NSView + + + + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../remoting.xcodeproj + 3 + + diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index ac3dd25..b8d1177 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -386,6 +386,10 @@ 'sources': [ 'host/me2me_preference_pane.h', 'host/me2me_preference_pane.mm', + 'host/me2me_preference_pane_confirm_pin.h', + 'host/me2me_preference_pane_confirm_pin.mm', + 'host/me2me_preference_pane_disable.h', + 'host/me2me_preference_pane_disable.mm', ], 'link_settings': { 'libraries': [ @@ -399,6 +403,8 @@ }, 'mac_bundle_resources': [ 'host/me2me_preference_pane.xib', + 'host/me2me_preference_pane_confirm_pin.xib', + 'host/me2me_preference_pane_disable.xib', 'host/me2me_preference_pane-Info.plist', 'resources/chromoting128.png', ], -- cgit v1.1