diff options
author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 05:55:06 +0000 |
---|---|---|
committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 05:55:06 +0000 |
commit | e251662cc98ddde6f01483e8f6195ac94a98e494 (patch) | |
tree | 5a70b2f84c5cbc44398c25a243d90113ac3e426b /chrome/browser/chromeos/cros/cros_library.cc | |
parent | cb58c8cffe58b6cb0aa357998179b7b03b41a8ec (diff) | |
download | chromium_src-e251662cc98ddde6f01483e8f6195ac94a98e494.zip chromium_src-e251662cc98ddde6f01483e8f6195ac94a98e494.tar.gz chromium_src-e251662cc98ddde6f01483e8f6195ac94a98e494.tar.bz2 |
Submitting http://codereview.chromium.org/2081006/show on behalf of rkc@chromium.org:
Changes for sending user e-mail along with the feedback
Changes to implement complete userfeedback stack.
TBR=zelidrag@chromium.org
TEST=none
BUG=chromium-os:2761
Review URL: http://codereview.chromium.org/2090011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/cros_library.cc')
-rw-r--r-- | chrome/browser/chromeos/cros/cros_library.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc index e57b428..023bc01 100644 --- a/chrome/browser/chromeos/cros/cros_library.cc +++ b/chrome/browser/chromeos/cros/cros_library.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,7 @@ #include "chrome/browser/chromeos/cros/screen_lock_library.h" #include "chrome/browser/chromeos/cros/speech_synthesis_library.h" #include "chrome/browser/chromeos/cros/synaptics_library.h" +#include "chrome/browser/chromeos/cros/syslogs_library.h" namespace chromeos { @@ -27,6 +28,7 @@ CrosLibrary::CrosLibrary() : library_loader_(NULL), screen_lock_lib_(NULL), speech_synthesis_lib_(NULL), synaptics_lib_(NULL), + syslogs_lib_(NULL), own_library_loader_(true), own_cryptohome_lib_(true), own_language_lib_(true), @@ -37,6 +39,7 @@ CrosLibrary::CrosLibrary() : library_loader_(NULL), own_screen_lock_lib_(true), own_speech_synthesis_lib_(true), own_synaptics_lib_(true), + own_syslogs_lib_(true), loaded_(false), load_error_(false), test_api_(NULL) { @@ -64,6 +67,8 @@ CrosLibrary::~CrosLibrary() { delete speech_synthesis_lib_; if (own_synaptics_lib_) delete synaptics_lib_; + if (own_syslogs_lib_) + delete syslogs_lib_; delete test_api_; } @@ -126,6 +131,12 @@ SynapticsLibrary* CrosLibrary::GetSynapticsLibrary() { return synaptics_lib_; } +SyslogsLibrary* CrosLibrary::GetSyslogsLibrary() { + if (!syslogs_lib_) + syslogs_lib_ = new SyslogsLibraryImpl(); + return syslogs_lib_; +} + bool CrosLibrary::EnsureLoaded() { if (!loaded_ && !load_error_) { if (!library_loader_) @@ -224,4 +235,12 @@ void CrosLibrary::TestApi::SetSynapticsLibrary(SynapticsLibrary* library, library_->synaptics_lib_ = library; } -} // end namespace. +void CrosLibrary::TestApi::SetSyslogsLibrary(SyslogsLibrary* library, + bool own) { + if (library_->syslogs_lib_) + delete library_->syslogs_lib_; + library_->own_syslogs_lib_ = own; + library_->syslogs_lib_ = library; +} + +} // namespace chromeos |