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

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

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix 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
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"
20 21
21 namespace chrome { 22 namespace chrome {
22 23
23 namespace { 24 namespace {
24 25
25 // Generic function to call SHGetFolderPath(). 26 // Generic function to call SHGetFolderPath().
26 bool GetUserDirectory(int csidl_folder, base::FilePath* result) { 27 bool GetUserDirectory(int csidl_folder, base::FilePath* result) {
27 // We need to go compute the value. It would be nice to support paths 28 // We need to go compute the value. It would be nice to support paths
28 // with names longer than MAX_PATH, but the system functions don't seem 29 // with names longer than MAX_PATH, but the system functions don't seem
29 // to be designed for it either, with the exception of GetTempPath 30 // to be designed for it either, with the exception of GetTempPath
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // TODO(pastarmovj): For now plugin broker processes are whitelisted too 118 // TODO(pastarmovj): For now plugin broker processes are whitelisted too
118 // because they do use the profile dir in some way and are not sandboxed. 119 // because they do use the profile dir in some way and are not sandboxed.
119 return process_type.empty() || 120 return process_type.empty() ||
120 process_type == switches::kServiceProcess || 121 process_type == switches::kServiceProcess ||
121 process_type == switches::kNaClBrokerProcess || 122 process_type == switches::kNaClBrokerProcess ||
122 process_type == switches::kNaClLoaderProcess || 123 process_type == switches::kNaClLoaderProcess ||
123 process_type == switches::kPpapiBrokerProcess; 124 process_type == switches::kPpapiBrokerProcess;
124 } 125 }
125 126
126 } // namespace chrome 127 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698