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

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

Issue 10579034: Removing incorrect usage of TO_L_STRING() macros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 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 | « remoting/host/branding.h ('k') | remoting/host/capturer_win.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) 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 #include "base/stringize_macros.h"
10 9
11 namespace { 10 namespace {
12 11
13 // TODO(lambroslambrou): The default locations should depend on whether Chrome 12 // TODO(lambroslambrou): The default locations should depend on whether Chrome
14 // branding is enabled - this means also modifying the Python daemon script. 13 // branding is enabled - this means also modifying the Python daemon script.
15 // 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
16 // 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
17 // command-line switches are absent. 16 // command-line switches are absent.
18 #if defined(OS_WIN) 17 #if defined(OS_WIN)
19 #ifdef OFFICIAL_BUILD 18 #ifdef OFFICIAL_BUILD
20 const FilePath::CharType kConfigDir[] = 19 const FilePath::CharType kConfigDir[] =
21 FILE_PATH_LITERAL("Google\\Chrome Remote Desktop"); 20 FILE_PATH_LITERAL("Google\\Chrome Remote Desktop");
22 #else 21 #else
23 const FilePath::CharType kConfigDir[] = 22 const FilePath::CharType kConfigDir[] =
24 FILE_PATH_LITERAL("Chromoting"); 23 FILE_PATH_LITERAL("Chromoting");
25 #endif 24 #endif
26 #elif defined(OS_MACOSX) 25 #elif defined(OS_MACOSX)
27 const FilePath::CharType kConfigDir[] = 26 const FilePath::CharType kConfigDir[] =
28 FILE_PATH_LITERAL("Chrome Remote Desktop"); 27 FILE_PATH_LITERAL("Chrome Remote Desktop");
29 #else 28 #else
30 const FilePath::CharType kConfigDir[] = 29 const FilePath::CharType kConfigDir[] =
31 FILE_PATH_LITERAL(".config/chrome-remote-desktop"); 30 FILE_PATH_LITERAL(".config/chrome-remote-desktop");
32 #endif 31 #endif
33 32
34 } // namespace 33 } // namespace
35 34
36 namespace remoting { 35 namespace remoting {
37 36
38 #if defined(OS_WIN) 37 #if defined(OS_WIN)
39 const char16 kWindowsServiceName[] = TO_L_STRING("chromoting"); 38 const wchar_t kWindowsServiceName[] = L"chromoting";
40 #endif 39 #endif
41 40
42 FilePath GetConfigDir() { 41 FilePath GetConfigDir() {
43 FilePath app_data_dir; 42 FilePath app_data_dir;
44 43
45 #if defined(OS_WIN) 44 #if defined(OS_WIN)
46 PathService::Get(base::DIR_COMMON_APP_DATA, &app_data_dir); 45 PathService::Get(base::DIR_COMMON_APP_DATA, &app_data_dir);
47 #elif defined(OS_MACOSX) 46 #elif defined(OS_MACOSX)
48 PathService::Get(base::DIR_APP_DATA, &app_data_dir); 47 PathService::Get(base::DIR_APP_DATA, &app_data_dir);
49 #else 48 #else
50 app_data_dir = file_util::GetHomeDir(); 49 app_data_dir = file_util::GetHomeDir();
51 #endif 50 #endif
52 51
53 return app_data_dir.Append(kConfigDir); 52 return app_data_dir.Append(kConfigDir);
54 } 53 }
55 54
56 } // namespace remoting 55 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/branding.h ('k') | remoting/host/capturer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698