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

Side by Side Diff: chrome/browser/speech/tts_controller_impl.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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
« no previous file with comments | « chrome/browser/speech/tts_controller_impl.h ('k') | chrome/browser/speech/tts_linux.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/speech/tts_controller_impl.h" 5 #include "chrome/browser/speech/tts_controller_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 TtsController* TtsController::GetInstance() { 104 TtsController* TtsController::GetInstance() {
105 return TtsControllerImpl::GetInstance(); 105 return TtsControllerImpl::GetInstance();
106 } 106 }
107 107
108 // 108 //
109 // TtsControllerImpl 109 // TtsControllerImpl
110 // 110 //
111 111
112 // static 112 // static
113 TtsControllerImpl* TtsControllerImpl::GetInstance() { 113 TtsControllerImpl* TtsControllerImpl::GetInstance() {
114 return Singleton<TtsControllerImpl>::get(); 114 return base::Singleton<TtsControllerImpl>::get();
115 } 115 }
116 116
117 TtsControllerImpl::TtsControllerImpl() 117 TtsControllerImpl::TtsControllerImpl()
118 : current_utterance_(NULL), 118 : current_utterance_(NULL),
119 paused_(false), 119 paused_(false),
120 platform_impl_(NULL), 120 platform_impl_(NULL),
121 tts_engine_delegate_(NULL) { 121 tts_engine_delegate_(NULL) {
122 } 122 }
123 123
124 TtsControllerImpl::~TtsControllerImpl() { 124 TtsControllerImpl::~TtsControllerImpl() {
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 481 }
482 482
483 void TtsControllerImpl::SetTtsEngineDelegate( 483 void TtsControllerImpl::SetTtsEngineDelegate(
484 TtsEngineDelegate* delegate) { 484 TtsEngineDelegate* delegate) {
485 tts_engine_delegate_ = delegate; 485 tts_engine_delegate_ = delegate;
486 } 486 }
487 487
488 TtsEngineDelegate* TtsControllerImpl::GetTtsEngineDelegate() { 488 TtsEngineDelegate* TtsControllerImpl::GetTtsEngineDelegate() {
489 return tts_engine_delegate_; 489 return tts_engine_delegate_;
490 } 490 }
OLDNEW
« no previous file with comments | « chrome/browser/speech/tts_controller_impl.h ('k') | chrome/browser/speech/tts_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698