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

Side by Side Diff: remoting/base/resources.cc

Issue 12286020: Replace FilePath with base::FilePath. (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 | « printing/backend/print_backend_cups.cc ('k') | remoting/protocol/authenticator_test_base.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/base/resources.h" 5 #include "remoting/base/resources.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/base/ui_base_paths.h" 10 #include "ui/base/ui_base_paths.h"
11 11
12 namespace remoting { 12 namespace remoting {
13 13
14 namespace { 14 namespace {
15 const char kLocaleResourcesDirName[] = "remoting_locales"; 15 const char kLocaleResourcesDirName[] = "remoting_locales";
16 const char kCommonResourcesFileName[] = "chrome_remote_desktop.pak"; 16 const char kCommonResourcesFileName[] = "chrome_remote_desktop.pak";
17 } // namespace 17 } // namespace
18 18
19 // Loads chromoting resources. 19 // Loads chromoting resources.
20 bool LoadResources(const std::string& pref_locale) { 20 bool LoadResources(const std::string& pref_locale) {
21 FilePath path; 21 base::FilePath path;
22 if (!PathService::Get(base::DIR_MODULE, &path)) 22 if (!PathService::Get(base::DIR_MODULE, &path))
23 return false; 23 return false;
24 24
25 PathService::Override(ui::DIR_LOCALES, 25 PathService::Override(ui::DIR_LOCALES,
26 path.AppendASCII(kLocaleResourcesDirName)); 26 path.AppendASCII(kLocaleResourcesDirName));
27 ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL); 27 ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL);
28 28
29 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( 29 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
30 path.AppendASCII(kCommonResourcesFileName), ui::SCALE_FACTOR_100P); 30 path.AppendASCII(kCommonResourcesFileName), ui::SCALE_FACTOR_100P);
31 31
32 return true; 32 return true;
33 } 33 }
34 34
35 } // namespace remoting 35 } // namespace remoting
OLDNEW
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | remoting/protocol/authenticator_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698