| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/resource_bundle.h" | |
| 6 #include "chrome/browser/tab_contents/tab_contents.h" | 5 #include "chrome/browser/tab_contents/tab_contents.h" |
| 7 #include "chrome/browser/speech/speech_input_bubble.h" | 6 #include "chrome/browser/speech/speech_input_bubble.h" |
| 8 #include "gfx/canvas_skia.h" | 7 #include "gfx/canvas_skia.h" |
| 9 #include "gfx/rect.h" | 8 #include "gfx/rect.h" |
| 10 #include "grit/generated_resources.h" | 9 #include "grit/generated_resources.h" |
| 11 #include "grit/theme_resources.h" | 10 #include "grit/theme_resources.h" |
| 11 #include "ui/base/resource/resource_bundle.h" |
| 12 | 12 |
| 13 SpeechInputBubble::FactoryMethod SpeechInputBubble::factory_ = NULL; | 13 SpeechInputBubble::FactoryMethod SpeechInputBubble::factory_ = NULL; |
| 14 const int SpeechInputBubble::kBubbleTargetOffsetX = 5; | 14 const int SpeechInputBubble::kBubbleTargetOffsetX = 5; |
| 15 | 15 |
| 16 SkBitmap* SpeechInputBubbleBase::mic_empty_ = NULL; | 16 SkBitmap* SpeechInputBubbleBase::mic_empty_ = NULL; |
| 17 SkBitmap* SpeechInputBubbleBase::mic_full_ = NULL; | 17 SkBitmap* SpeechInputBubbleBase::mic_full_ = NULL; |
| 18 SkBitmap* SpeechInputBubbleBase::mic_mask_ = NULL; | 18 SkBitmap* SpeechInputBubbleBase::mic_mask_ = NULL; |
| 19 SkBitmap* SpeechInputBubbleBase::spinner_ = NULL; | 19 SkBitmap* SpeechInputBubbleBase::spinner_ = NULL; |
| 20 const int SpeechInputBubbleBase::kRecognizingAnimationStepMs = 100; | 20 const int SpeechInputBubbleBase::kRecognizingAnimationStepMs = 100; |
| 21 | 21 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 SkPaint multiply_paint; | 142 SkPaint multiply_paint; |
| 143 multiply_paint.setXfermode(SkXfermode::Create(SkXfermode::kMultiply_Mode)); | 143 multiply_paint.setXfermode(SkXfermode::Create(SkXfermode::kMultiply_Mode)); |
| 144 buffer_canvas.drawBitmap(*mic_mask_, 0, clip_top, &multiply_paint); | 144 buffer_canvas.drawBitmap(*mic_mask_, 0, clip_top, &multiply_paint); |
| 145 | 145 |
| 146 // Draw the empty volume image first and the current volume image on top. | 146 // Draw the empty volume image first and the current volume image on top. |
| 147 canvas.drawBitmap(*mic_empty_, 0, 0); | 147 canvas.drawBitmap(*mic_empty_, 0, 0); |
| 148 canvas.drawBitmap(*buffer_image_.get(), 0, 0); | 148 canvas.drawBitmap(*buffer_image_.get(), 0, 0); |
| 149 | 149 |
| 150 SetImage(*mic_image_.get()); | 150 SetImage(*mic_image_.get()); |
| 151 } | 151 } |
| OLD | NEW |