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

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

Issue 8334018: Move the code in libcros' chromeos_speech_synthesis.cc into Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed ScopedRunnableMethodFactory Created 9 years, 2 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 | « chrome/browser/chromeos/cros/cros_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "chrome/browser/chromeos/cros/cros_library.h"
6 6
7 #include "chrome/browser/chromeos/cros/burn_library.h" 7 #include "chrome/browser/chromeos/cros/burn_library.h"
8 #include "chrome/browser/chromeos/cros/cert_library.h" 8 #include "chrome/browser/chromeos/cros/cert_library.h"
9 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 9 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
10 #include "chrome/browser/chromeos/cros/library_loader.h" 10 #include "chrome/browser/chromeos/cros/library_loader.h"
11 #include "chrome/browser/chromeos/cros/login_library.h" 11 #include "chrome/browser/chromeos/cros/login_library.h"
12 #include "chrome/browser/chromeos/cros/mount_library.h" 12 #include "chrome/browser/chromeos/cros/mount_library.h"
13 #include "chrome/browser/chromeos/cros/network_library.h" 13 #include "chrome/browser/chromeos/cros/network_library.h"
14 #include "chrome/browser/chromeos/cros/power_library.h" 14 #include "chrome/browser/chromeos/cros/power_library.h"
15 #include "chrome/browser/chromeos/cros/screen_lock_library.h" 15 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
16 #include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
17 #include "chrome/browser/chromeos/cros/update_library.h" 16 #include "chrome/browser/chromeos/cros/update_library.h"
18 #include "third_party/cros/chromeos_cros_api.h" 17 #include "third_party/cros/chromeos_cros_api.h"
19 18
20 // Pass !libcros_loaded_ to GetDefaultImpl instead of use_stub_impl_ so that 19 // Pass !libcros_loaded_ to GetDefaultImpl instead of use_stub_impl_ so that
21 // we load the stub impl regardless of whether use_stub was specified or the 20 // we load the stub impl regardless of whether use_stub was specified or the
22 // library failed to load. 21 // library failed to load.
23 #define DEFINE_GET_LIBRARY_METHOD(class_prefix, var_prefix) \ 22 #define DEFINE_GET_LIBRARY_METHOD(class_prefix, var_prefix) \
24 class_prefix##Library* CrosLibrary::Get##class_prefix##Library() { \ 23 class_prefix##Library* CrosLibrary::Get##class_prefix##Library() { \
25 return var_prefix##_lib_.GetDefaultImpl(!libcros_loaded_); \ 24 return var_prefix##_lib_.GetDefaultImpl(!libcros_loaded_); \
26 } 25 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 81 }
83 82
84 DEFINE_GET_LIBRARY_METHOD(Burn, burn); 83 DEFINE_GET_LIBRARY_METHOD(Burn, burn);
85 DEFINE_GET_LIBRARY_METHOD(Cert, cert); 84 DEFINE_GET_LIBRARY_METHOD(Cert, cert);
86 DEFINE_GET_LIBRARY_METHOD(Cryptohome, crypto); 85 DEFINE_GET_LIBRARY_METHOD(Cryptohome, crypto);
87 DEFINE_GET_LIBRARY_METHOD(Login, login); 86 DEFINE_GET_LIBRARY_METHOD(Login, login);
88 DEFINE_GET_LIBRARY_METHOD(Mount, mount); 87 DEFINE_GET_LIBRARY_METHOD(Mount, mount);
89 DEFINE_GET_LIBRARY_METHOD(Network, network); 88 DEFINE_GET_LIBRARY_METHOD(Network, network);
90 DEFINE_GET_LIBRARY_METHOD(Power, power); 89 DEFINE_GET_LIBRARY_METHOD(Power, power);
91 DEFINE_GET_LIBRARY_METHOD(ScreenLock, screen_lock); 90 DEFINE_GET_LIBRARY_METHOD(ScreenLock, screen_lock);
92 DEFINE_GET_LIBRARY_METHOD(SpeechSynthesis, speech_synthesis);
93 DEFINE_GET_LIBRARY_METHOD(Update, update); 91 DEFINE_GET_LIBRARY_METHOD(Update, update);
94 92
95 bool CrosLibrary::LoadLibcros() { 93 bool CrosLibrary::LoadLibcros() {
96 if (!libcros_loaded_ && !load_error_) { 94 if (!libcros_loaded_ && !load_error_) {
97 if (!library_loader_) { 95 if (!library_loader_) {
98 library_loader_ = LibraryLoader::GetImpl(); 96 library_loader_ = LibraryLoader::GetImpl();
99 own_library_loader_ = true; 97 own_library_loader_ = true;
100 } 98 }
101 libcros_loaded_ = library_loader_->Load(&load_error_string_); 99 libcros_loaded_ = library_loader_->Load(&load_error_string_);
102 load_error_ = !libcros_loaded_; 100 load_error_ = !libcros_loaded_;
(...skipping 27 matching lines...) Expand all
130 } 128 }
131 129
132 DEFINE_SET_LIBRARY_METHOD(Cert, cert); 130 DEFINE_SET_LIBRARY_METHOD(Cert, cert);
133 DEFINE_SET_LIBRARY_METHOD(Burn, burn); 131 DEFINE_SET_LIBRARY_METHOD(Burn, burn);
134 DEFINE_SET_LIBRARY_METHOD(Cryptohome, crypto); 132 DEFINE_SET_LIBRARY_METHOD(Cryptohome, crypto);
135 DEFINE_SET_LIBRARY_METHOD(Login, login); 133 DEFINE_SET_LIBRARY_METHOD(Login, login);
136 DEFINE_SET_LIBRARY_METHOD(Mount, mount); 134 DEFINE_SET_LIBRARY_METHOD(Mount, mount);
137 DEFINE_SET_LIBRARY_METHOD(Network, network); 135 DEFINE_SET_LIBRARY_METHOD(Network, network);
138 DEFINE_SET_LIBRARY_METHOD(Power, power); 136 DEFINE_SET_LIBRARY_METHOD(Power, power);
139 DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock); 137 DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock);
140 DEFINE_SET_LIBRARY_METHOD(SpeechSynthesis, speech_synthesis);
141 DEFINE_SET_LIBRARY_METHOD(Update, update); 138 DEFINE_SET_LIBRARY_METHOD(Update, update);
142 139
143 } // namespace chromeos 140 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cros_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