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

Side by Side Diff: chrome/browser/chromeos/cros/cros_library_loader.cc

Issue 5854003: Remove CrOS hack from ppapi.gyp that made the include directories work. This... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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/browser/chromeos/cros/burn_library.h ('k') | chrome/browser/chromeos/cros/cros_mock.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser/chromeos/cros/cros_library_loader.h" 5 #include "chrome/browser/chromeos/cros/cros_library_loader.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "cros/chromeos_cros_api.h" 13 #include "third_party/cros/chromeos_cros_api.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 bool CrosLibraryLoader::Load(std::string* load_error_string) { 17 bool CrosLibraryLoader::Load(std::string* load_error_string) {
18 bool loaded = false; 18 bool loaded = false;
19 FilePath path; 19 FilePath path;
20 if (PathService::Get(chrome::FILE_CHROMEOS_API, &path)) 20 if (PathService::Get(chrome::FILE_CHROMEOS_API, &path))
21 loaded = LoadLibcros(path.value().c_str(), *load_error_string); 21 loaded = LoadLibcros(path.value().c_str(), *load_error_string);
22 22
23 if (!loaded) { 23 if (!loaded) {
24 LOG(ERROR) << "Problem loading chromeos shared object: " 24 LOG(ERROR) << "Problem loading chromeos shared object: "
25 << *load_error_string; 25 << *load_error_string;
26 } 26 }
27 return loaded; 27 return loaded;
28 } 28 }
29 29
30 } // namespace chromeos 30 } // namespace chromeos
31 31
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/burn_library.h ('k') | chrome/browser/chromeos/cros/cros_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698