OLD | NEW |
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 <string> | 9 #include <string> |
10 | 10 |
| 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
12 #include "third_party/jsoncpp/source/include/json/value.h" | 13 #include "third_party/jsoncpp/source/include/json/value.h" |
13 | 14 |
14 namespace remoting { | 15 namespace remoting { |
15 | 16 |
16 // 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 |
17 // 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. |
18 | 19 |
19 // 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 |
20 // 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 |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 - (void)checkInstalledVersion; | 138 - (void)checkInstalledVersion; |
138 | 139 |
139 - (void)mismatchAlertDidEnd:(NSAlert*)alert | 140 - (void)mismatchAlertDidEnd:(NSAlert*)alert |
140 returnCode:(NSInteger)returnCode | 141 returnCode:(NSInteger)returnCode |
141 contextInfo:(void*)contextInfo; | 142 contextInfo:(void*)contextInfo; |
142 | 143 |
143 // 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. |
144 - (void)restartSystemPreferences; | 145 - (void)restartSystemPreferences; |
145 | 146 |
146 @end | 147 @end |
OLD | NEW |