summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 20:29:37 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 20:29:37 +0000
commit0865c1342c3413c3b6f8d698105a9d7340d92cf2 (patch)
treef89ef79c9b6d86290fea29f9db4d88f421a00da9 /chrome/browser/speech
parent68f3099b071756a717e850f4d3c1cb8a0ef00c6e (diff)
downloadchromium_src-0865c1342c3413c3b6f8d698105a9d7340d92cf2.zip
chromium_src-0865c1342c3413c3b6f8d698105a9d7340d92cf2.tar.gz
chromium_src-0865c1342c3413c3b6f8d698105a9d7340d92cf2.tar.bz2
Part 2 of repairing regressions to my old clang check plugins so Nico can
deploy the clang plugins to the waterfall/trybots. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6272025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/speech_input_bubble.cc6
-rw-r--r--chrome/browser/speech/speech_input_bubble.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/speech/speech_input_bubble.cc b/chrome/browser/speech/speech_input_bubble.cc
index eb5b82e..3e6cf90 100644
--- a/chrome/browser/speech/speech_input_bubble.cc
+++ b/chrome/browser/speech/speech_input_bubble.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -149,3 +149,7 @@ void SpeechInputBubbleBase::SetInputVolume(float volume) {
SetImage(*mic_image_.get());
}
+
+TabContents* SpeechInputBubbleBase::tab_contents() {
+ return tab_contents_;
+}
diff --git a/chrome/browser/speech/speech_input_bubble.h b/chrome/browser/speech/speech_input_bubble.h
index 436e6bb..dd5d21b 100644
--- a/chrome/browser/speech/speech_input_bubble.h
+++ b/chrome/browser/speech/speech_input_bubble.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -130,7 +130,7 @@ class SpeechInputBubbleBase : public SpeechInputBubble {
virtual void SetRecognizingMode();
virtual void SetMessage(const string16& text);
virtual void SetInputVolume(float volume);
- virtual TabContents* tab_contents() { return tab_contents_; }
+ virtual TabContents* tab_contents();
protected:
// Updates the platform specific UI layout for the current display mode.