chrome/browser/speech/speech_recognition_tray_icon_controller.cc - Issue 10407120: Moving tray icon and notification balloon for background speech recognition sessions to ChromeSpeec…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10407120: Moving tray icon and notification balloon for background speech recognition sessions to ChromeSpeec… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Turned context_name to string (instead of string16) Created 8 years, 6 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

« chrome/browser/speech/chrome_speech_recognition_manager_delegate.h ('K') | « chrome/browser/speech/speech_input_extension_manager.cc ('k') | chrome/common/pref_names.h » ('j') | content/browser/speech/speech_recognition_dispatcher_host.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

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

8 #include "base/lazy_instance.h"	8 #include "base/lazy_instance.h"

9 #include "base/string16.h"	9 #include "base/string16.h"

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

(...skipping 174 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
185 canvas->drawBitmap(*buffer_image_.get(), 0, 0);	185 canvas->drawBitmap(*buffer_image_.get(), 0, 0);

186 }	186 }

187	187

188 void SpeechRecognitionTrayIconController::ShowNotificationBalloon(	188 void SpeechRecognitionTrayIconController::ShowNotificationBalloon(

189 const string16& text) {	189 const string16& text) {

190 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));	190 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

191 string16 title = l10n_util::GetStringUTF16(	191 string16 title = l10n_util::GetStringUTF16(

192 IDS_SPEECH_INPUT_TRAY_BALLOON_TITLE);	192 IDS_SPEECH_INPUT_TRAY_BALLOON_TITLE);

193 string16 message = l10n_util::GetStringFUTF16(	193 string16 message = l10n_util::GetStringFUTF16(

194 IDS_SPEECH_INPUT_TRAY_BALLOON_BODY,	194 IDS_SPEECH_INPUT_TRAY_BALLOON_BODY,

195 text,	195 text);

196 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));

197	196

198 tray_icon_->DisplayBalloon(*g_images.Get().balloon_icon(), title, message);	197 tray_icon_->DisplayBalloon(*g_images.Get().balloon_icon(), title, message);

199 }	198 }

OLD	NEW