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

Side by Side Diff: remoting/host/win/elevated_controller.cc

Issue 12179013: Revert 180433 because build\some.gyp was added to the CL by mistake. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
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 #include "remoting/host/win/elevated_controller.h" 5 #include "remoting/host/win/elevated_controller.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/file_version_info.h" 8 #include "base/file_version_info.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/process_util.h" 14 #include "base/process_util.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "base/win/scoped_handle.h" 17 #include "base/win/scoped_handle.h"
18 #include "remoting/host/branding.h" 18 #include "remoting/host/branding.h"
19 #include "remoting/host/usage_stats_consent.h" 19 #include "remoting/host/usage_stats_consent.h"
20 #include "remoting/host/verify_config_window_win.h" 20 #include "remoting/host/verify_config_window_win.h"
21 #include "remoting/host/win/core_resource.h" 21 #include "remoting/host/win/elevated_controller_resource.h"
22 #include "remoting/host/win/security_descriptor.h" 22 #include "remoting/host/win/security_descriptor.h"
23 23
24 namespace remoting { 24 namespace remoting {
25 25
26 namespace { 26 namespace {
27 27
28 // The maximum size of the configuration file. "1MB ought to be enough" for any 28 // The maximum size of the configuration file. "1MB ought to be enough" for any
29 // reasonable configuration we will ever need. 1MB is low enough to make 29 // reasonable configuration we will ever need. 1MB is low enough to make
30 // the probability of out of memory situation fairly low. OOM is still possible 30 // the probability of out of memory situation fairly low. OOM is still possible
31 // and we will crash if it occurs. 31 // and we will crash if it occurs.
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 << "Failed to open to the '" << kWindowsServiceName << "' service"; 522 << "Failed to open to the '" << kWindowsServiceName << "' service";
523 523
524 return HRESULT_FROM_WIN32(error); 524 return HRESULT_FROM_WIN32(error);
525 } 525 }
526 526
527 service_out->Set(service.Take()); 527 service_out->Set(service.Take());
528 return S_OK; 528 return S_OK;
529 } 529 }
530 530
531 } // namespace remoting 531 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/desktop_process_entry_point.cc ('k') | remoting/host/win/elevated_controller.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698