chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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 | « chrome/browser/signin/token_service.cc ('k') | chrome/browser/speech/chrome_speech_recognition_preferences.cc » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"	5 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"

6	6

7 #include <set>	7 #include <set>

8 #include <string>	8 #include <string>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

	11 #include "base/prefs/pref_service.h"

11 #include "base/synchronization/lock.h"	12 #include "base/synchronization/lock.h"

12 #include "base/threading/thread_restrictions.h"	13 #include "base/threading/thread_restrictions.h"

13 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/extensions/extension_service.h"	16 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

18 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"	18 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"

19 #include "chrome/browser/tab_contents/tab_util.h"	19 #include "chrome/browser/tab_contents/tab_util.h"

20 #include "chrome/browser/view_type_utils.h"	20 #include "chrome/browser/view_type_utils.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "content/public/browser/browser_thread.h"	22 #include "content/public/browser/browser_thread.h"

23 #include "content/public/browser/notification_registrar.h"	23 #include "content/public/browser/notification_registrar.h"

24 #include "content/public/browser/notification_source.h"	24 #include "content/public/browser/notification_source.h"

25 #include "content/public/browser/notification_types.h"	25 #include "content/public/browser/notification_types.h"

26 #include "content/public/browser/render_process_host.h"	26 #include "content/public/browser/render_process_host.h"

(...skipping 496 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
523 }	523 }

524	524

525 SpeechRecognitionBubbleController*	525 SpeechRecognitionBubbleController*

526 ChromeSpeechRecognitionManagerDelegate::GetBubbleController() {	526 ChromeSpeechRecognitionManagerDelegate::GetBubbleController() {

527 if (!bubble_controller_.get())	527 if (!bubble_controller_.get())

528 bubble_controller_ = new SpeechRecognitionBubbleController(this);	528 bubble_controller_ = new SpeechRecognitionBubbleController(this);

529 return bubble_controller_.get();	529 return bubble_controller_.get();

530 }	530 }

531	531

532 } // namespace speech	532 } // namespace speech

OLD	NEW