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

Side by Side Diff: chrome/common/chrome_paths_win.cc

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/common/DEPS ('k') | chrome/common/chrome_switches.h » ('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 #include "chrome/common/chrome_paths_internal.h" 5 #include "chrome/common/chrome_paths_internal.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <knownfolders.h> 8 #include <knownfolders.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
11 #include <shobjidl.h> 11 #include <shobjidl.h>
12 12
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/win/metro.h" 15 #include "base/win/metro.h"
16 #include "base/win/scoped_co_mem.h" 16 #include "base/win/scoped_co_mem.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/installer/util/browser_distribution.h" 19 #include "chrome/installer/util/browser_distribution.h"
20 #include "components/nacl/common/nacl_switches.h"
21 20
22 namespace chrome { 21 namespace chrome {
23 22
24 namespace { 23 namespace {
25 24
26 // Generic function to call SHGetFolderPath(). 25 // Generic function to call SHGetFolderPath().
27 bool GetUserDirectory(int csidl_folder, base::FilePath* result) { 26 bool GetUserDirectory(int csidl_folder, base::FilePath* result) {
28 // We need to go compute the value. It would be nice to support paths 27 // We need to go compute the value. It would be nice to support paths
29 // with names longer than MAX_PATH, but the system functions don't seem 28 // with names longer than MAX_PATH, but the system functions don't seem
30 // to be designed for it either, with the exception of GetTempPath 29 // to be designed for it either, with the exception of GetTempPath
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 // TODO(pastarmovj): For now plugin broker processes are whitelisted too 117 // TODO(pastarmovj): For now plugin broker processes are whitelisted too
119 // because they do use the profile dir in some way and are not sandboxed. 118 // because they do use the profile dir in some way and are not sandboxed.
120 return process_type.empty() || 119 return process_type.empty() ||
121 process_type == switches::kServiceProcess || 120 process_type == switches::kServiceProcess ||
122 process_type == switches::kNaClBrokerProcess || 121 process_type == switches::kNaClBrokerProcess ||
123 process_type == switches::kNaClLoaderProcess || 122 process_type == switches::kNaClLoaderProcess ||
124 process_type == switches::kPpapiBrokerProcess; 123 process_type == switches::kPpapiBrokerProcess;
125 } 124 }
126 125
127 } // namespace chrome 126 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698