Add a noise indicator to the speech bubble volume indicator.

chrome/browser/speech/speech_input_bubble.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPEECH_SPEECH_INPUT_BUBBLE_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_BUBBLE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/task.h"
 
 namespace gfx {
+class Canvas;
 class Rect;
 }
 class SkBitmap;
+class SkCanvas;
 class TabContents;
 
 // SpeechInputBubble displays a popup info bubble during speech recognition,
 // points to the html element which requested speech input and shows recognition
 // progress events. The popup is closed by the user clicking anywhere outside
 // the popup window, or by the caller destroying this object.
 class SpeechInputBubble {
  public:
   // The various buttons which may be part of the bubble.
   enum Button {
@@ skipping 60 matching lines @@
   // bubble is hidden, |Show| must be called to make it appear on screen.
   virtual void SetMessage(const string16& text) = 0;
 
   // Brings up the bubble on screen.
   virtual void Show() = 0;
 
   // Hides the info bubble, resulting in a call to
   // |Delegate::InfoBubbleFocusChanged| as well.
   virtual void Hide() = 0;
 
   // Updates the current captured audio volume displayed on screen.

[bulach, 2011/03/01 17:39:04]

perhaps "Updates and draws the current..."

-  virtual void SetInputVolume(float volume) = 0;
+  virtual void SetInputVolume(float volume, float noise_volume) = 0;
 
   // Returns the TabContents for which this bubble gets displayed.
   virtual TabContents* tab_contents() = 0;
 
   // The horizontal distance between the start of the html widget and the speech
   // bubble's arrow.
   static const int kBubbleTargetOffsetX;
 
  private:
   static FactoryMethod factory_;
@@ skipping 11 matching lines @@
     DISPLAY_MODE_MESSAGE
   };
 
   explicit SpeechInputBubbleBase(TabContents* tab_contents);
   virtual ~SpeechInputBubbleBase();
 
   // SpeechInputBubble methods
   virtual void SetRecordingMode();
   virtual void SetRecognizingMode();
   virtual void SetMessage(const string16& text);
-  virtual void SetInputVolume(float volume);
+  virtual void SetInputVolume(float volume, float noise_volume);
   virtual TabContents* tab_contents();
 
  protected:
   // Updates the platform specific UI layout for the current display mode.
   virtual void UpdateLayout() = 0;
 
   // Sets the given image as the image to display in the speech bubble.
   // TODO(satish): Make the SetRecognizingMode call use this to show an
   // animation while waiting for results.
   virtual void SetImage(const SkBitmap& image) = 0;
 
   DisplayMode display_mode() {
     return display_mode_;
   }
 
   string16 message_text() {
     return message_text_;
   }
 
  private:
   void DoRecognizingAnimationStep();
 
+  void DrawVolumeOverlay(SkCanvas& canvas, SkBitmap* bitmap, float volume);

[hans, 2011/03/01 17:25:25]

nit: spontaneously, i would have made |bitmap| a const ref if you're not going
to change it? but i suppose it doesn't really matter

[bulach, 2011/03/01 17:39:04]

either SkCanvas* or const SkCanvas&

+
   // Task factory used for animation timer.
   ScopedRunnableMethodFactory<SpeechInputBubbleBase> task_factory_;
   int animation_step_;  // Current index/step of the animation.
   std::vector<SkBitmap> animation_frames_;
 
   DisplayMode display_mode_;
   string16 message_text_;  // Text displayed in DISPLAY_MODE_MESSAGE
   // The current microphone image with volume level indication.
   scoped_ptr<SkBitmap> mic_image_;
   // A temporary buffer image used in creating the above mic image.
   scoped_ptr<SkBitmap> buffer_image_;
   // TabContents in which this this bubble gets displayed.
   TabContents* tab_contents_;
 
   static SkBitmap* mic_full_;  // Mic image with full volume.
+  static SkBitmap* mic_noise_;  // Mic image with full noise volume.
   static SkBitmap* mic_empty_;  // Mic image with zero volume.
   static SkBitmap* mic_mask_;  // Gradient mask used by the volume indicator.
   static SkBitmap* spinner_;  // Spinner image for the progress animation.
   static const int kRecognizingAnimationStepMs;
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputBubble::Delegate SpeechInputBubbleDelegate;
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_BUBBLE_H_