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

Side by Side Diff: remoting/host/branding.cc

Issue 12163003: Add FilePath to base namespace. (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
« no previous file with comments | « remoting/host/branding.h ('k') | remoting/host/config_file_watcher.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 "remoting/host/branding.h" 5 #include "remoting/host/branding.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 9
10 namespace { 10 namespace {
11 11
12 // TODO(lambroslambrou): The default locations should depend on whether Chrome 12 // TODO(lambroslambrou): The default locations should depend on whether Chrome
13 // branding is enabled - this means also modifying the Python daemon script. 13 // branding is enabled - this means also modifying the Python daemon script.
14 // The actual location of the files is ultimately determined by the service 14 // The actual location of the files is ultimately determined by the service
15 // daemon and NPAPI implementation - these defaults are only used in case the 15 // daemon and NPAPI implementation - these defaults are only used in case the
16 // command-line switches are absent. 16 // command-line switches are absent.
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #ifdef OFFICIAL_BUILD 18 #ifdef OFFICIAL_BUILD
19 const FilePath::CharType kConfigDir[] = 19 const base::FilePath::CharType kConfigDir[] =
20 FILE_PATH_LITERAL("Google\\Chrome Remote Desktop"); 20 FILE_PATH_LITERAL("Google\\Chrome Remote Desktop");
21 #else 21 #else
22 const FilePath::CharType kConfigDir[] = 22 const base::FilePath::CharType kConfigDir[] =
23 FILE_PATH_LITERAL("Chromoting"); 23 FILE_PATH_LITERAL("Chromoting");
24 #endif 24 #endif
25 #elif defined(OS_MACOSX) 25 #elif defined(OS_MACOSX)
26 const FilePath::CharType kConfigDir[] = 26 const base::FilePath::CharType kConfigDir[] =
27 FILE_PATH_LITERAL("Chrome Remote Desktop"); 27 FILE_PATH_LITERAL("Chrome Remote Desktop");
28 #else 28 #else
29 const FilePath::CharType kConfigDir[] = 29 const base::FilePath::CharType kConfigDir[] =
30 FILE_PATH_LITERAL(".config/chrome-remote-desktop"); 30 FILE_PATH_LITERAL(".config/chrome-remote-desktop");
31 #endif 31 #endif
32 32
33 } // namespace 33 } // namespace
34 34
35 namespace remoting { 35 namespace remoting {
36 36
37 #if defined(OS_WIN) 37 #if defined(OS_WIN)
38 const wchar_t kWindowsServiceName[] = L"chromoting"; 38 const wchar_t kWindowsServiceName[] = L"chromoting";
39 #endif 39 #endif
40 40
41 FilePath GetConfigDir() { 41 base::FilePath GetConfigDir() {
42 FilePath app_data_dir; 42 base::FilePath app_data_dir;
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 PathService::Get(base::DIR_COMMON_APP_DATA, &app_data_dir); 45 PathService::Get(base::DIR_COMMON_APP_DATA, &app_data_dir);
46 #elif defined(OS_MACOSX) 46 #elif defined(OS_MACOSX)
47 PathService::Get(base::DIR_APP_DATA, &app_data_dir); 47 PathService::Get(base::DIR_APP_DATA, &app_data_dir);
48 #else 48 #else
49 app_data_dir = file_util::GetHomeDir(); 49 app_data_dir = file_util::GetHomeDir();
50 #endif 50 #endif
51 51
52 return app_data_dir.Append(kConfigDir); 52 return app_data_dir.Append(kConfigDir);
53 } 53 }
54 54
55 } // namespace remoting 55 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/branding.h ('k') | remoting/host/config_file_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698