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

Side by Side Diff: remoting/host/mac/me2me_preference_pane.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « remoting/host/local_input_monitor_x11.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #import <PreferencePanes/PreferencePanes.h> 6 #import <PreferencePanes/PreferencePanes.h>
7 #import <SecurityInterface/SFAuthorizationView.h> 7 #import <SecurityInterface/SFAuthorizationView.h>
8 8
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "third_party/jsoncpp/source/include/json/value.h" 13 #include "third_party/jsoncpp/source/include/json/value.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 16
17 // This is an implementation of JsonHostConfig which does not use code from 17 // This is an implementation of JsonHostConfig which does not use code from
18 // the "base" target, so it can be built for 64-bit on Mac OS X. 18 // the "base" target, so it can be built for 64-bit on Mac OS X.
19 19
20 // TODO(lambroslambrou): Once the "base" target has 64-bit support, remove this 20 // TODO(lambroslambrou): Once the "base" target has 64-bit support, remove this
21 // implementation and use the functions from remoting/host/host_config.h - see 21 // implementation and use the functions from remoting/host/host_config.h - see
22 // http://crbug.com/128122. 22 // http://crbug.com/128122.
(...skipping 21 matching lines...) Expand all
44 @interface Me2MePreferencePane : NSPreferencePane { 44 @interface Me2MePreferencePane : NSPreferencePane {
45 Me2MePreferencePaneConfirmPin* confirm_pin_view_; 45 Me2MePreferencePaneConfirmPin* confirm_pin_view_;
46 Me2MePreferencePaneDisable* disable_view_; 46 Me2MePreferencePaneDisable* disable_view_;
47 47
48 IBOutlet NSTextField* status_message_; 48 IBOutlet NSTextField* status_message_;
49 IBOutlet NSBox* box_; 49 IBOutlet NSBox* box_;
50 IBOutlet SFAuthorizationView* authorization_view_; 50 IBOutlet SFAuthorizationView* authorization_view_;
51 51
52 // Holds the new proposed configuration if a temporary config file is 52 // Holds the new proposed configuration if a temporary config file is
53 // present. 53 // present.
54 scoped_ptr<remoting::JsonHostConfig> config_; 54 std::unique_ptr<remoting::JsonHostConfig> config_;
55 55
56 NSTimer* service_status_timer_; 56 NSTimer* service_status_timer_;
57 57
58 // These flags determine the UI state. These are computed in the 58 // These flags determine the UI state. These are computed in the
59 // update...Status methods. 59 // update...Status methods.
60 BOOL is_service_running_; 60 BOOL is_service_running_;
61 BOOL is_pane_unlocked_; 61 BOOL is_pane_unlocked_;
62 62
63 // True if a new proposed config file has been loaded into memory. 63 // True if a new proposed config file has been loaded into memory.
64 BOOL have_new_config_; 64 BOOL have_new_config_;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 - (void)checkInstalledVersion; 138 - (void)checkInstalledVersion;
139 139
140 - (void)mismatchAlertDidEnd:(NSAlert*)alert 140 - (void)mismatchAlertDidEnd:(NSAlert*)alert
141 returnCode:(NSInteger)returnCode 141 returnCode:(NSInteger)returnCode
142 contextInfo:(void*)contextInfo; 142 contextInfo:(void*)contextInfo;
143 143
144 // Called when the user chooses OK when prompted to restart System Preferences. 144 // Called when the user chooses OK when prompted to restart System Preferences.
145 - (void)restartSystemPreferences; 145 - (void)restartSystemPreferences;
146 146
147 @end 147 @end
OLDNEW
« no previous file with comments | « remoting/host/local_input_monitor_x11.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698