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

Side by Side Diff: chrome_frame/chrome_launcher.cc

Issue 2081007: Enable warning 4389 as an error on windows builds. This will make... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/function_stub_unittest.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome_frame/chrome_launcher.h" 5 #include "chrome_frame/chrome_launcher.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 "What module is this? It's not in 'servers' or main output dir."; 58 "What module is this? It's not in 'servers' or main output dir.";
59 return new CommandLine(servers_path); 59 return new CommandLine(servers_path);
60 } 60 }
61 } else { 61 } else {
62 NOTREACHED(); 62 NOTREACHED();
63 return NULL; 63 return NULL;
64 } 64 }
65 } 65 }
66 66
67 void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized) { 67 void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized) {
68 int num_sanitized_switches = 0; 68 size_t num_sanitized_switches = 0;
69 for (int i = 0; i < arraysize(kAllowedSwitches); ++i) { 69 for (int i = 0; i < arraysize(kAllowedSwitches); ++i) {
70 const char* current_switch = kAllowedSwitches[i]; 70 const char* current_switch = kAllowedSwitches[i];
71 if (original.HasSwitch(current_switch)) { 71 if (original.HasSwitch(current_switch)) {
72 ++num_sanitized_switches; 72 ++num_sanitized_switches;
73 std::wstring switch_value = original.GetSwitchValue(current_switch); 73 std::wstring switch_value = original.GetSwitchValue(current_switch);
74 if (0 == switch_value.length()) { 74 if (0 == switch_value.length()) {
75 sanitized->AppendSwitch(current_switch); 75 sanitized->AppendSwitch(current_switch);
76 } else { 76 } else {
77 sanitized->AppendSwitchWithValue(current_switch, switch_value); 77 sanitized->AppendSwitchWithValue(current_switch, switch_value);
78 } 78 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 return result; 132 return result;
133 } 133 }
134 134
135 // Compile-time check to see that the type CfLaunchChromeProc is correct. 135 // Compile-time check to see that the type CfLaunchChromeProc is correct.
136 #ifndef NODEBUG 136 #ifndef NODEBUG
137 namespace { 137 namespace {
138 chrome_launcher::CfLaunchChromeProc cf_launch_chrome = CfLaunchChrome; 138 chrome_launcher::CfLaunchChromeProc cf_launch_chrome = CfLaunchChrome;
139 } // namespace 139 } // namespace
140 #endif // NODEBUG 140 #endif // NODEBUG
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/function_stub_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698