OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/lazy_instance.h" | 5 #include "base/lazy_instance.h" |
6 #include "base/message_loop.h" | |
7 #include "chrome/browser/speech/speech_input_bubble.h" | 6 #include "chrome/browser/speech/speech_input_bubble.h" |
8 #include "content/browser/tab_contents/tab_contents.h" | 7 #include "content/browser/tab_contents/tab_contents.h" |
9 #include "grit/generated_resources.h" | 8 #include "grit/generated_resources.h" |
10 #include "grit/theme_resources.h" | 9 #include "grit/theme_resources.h" |
11 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
12 #include "ui/gfx/canvas_skia.h" | 11 #include "ui/gfx/canvas_skia.h" |
13 #include "ui/gfx/rect.h" | 12 #include "ui/gfx/rect.h" |
14 #include "ui/gfx/skbitmap_operations.h" | 13 #include "ui/gfx/skbitmap_operations.h" |
15 | 14 |
16 namespace { | 15 namespace { |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 } | 234 } |
236 | 235 |
237 void SpeechInputBubbleBase::SetImage(const SkBitmap& image) { | 236 void SpeechInputBubbleBase::SetImage(const SkBitmap& image) { |
238 icon_image_.reset(new SkBitmap(image)); | 237 icon_image_.reset(new SkBitmap(image)); |
239 UpdateImage(); | 238 UpdateImage(); |
240 } | 239 } |
241 | 240 |
242 SkBitmap SpeechInputBubbleBase::icon_image() { | 241 SkBitmap SpeechInputBubbleBase::icon_image() { |
243 return (icon_image_ != NULL) ? *icon_image_ : SkBitmap(); | 242 return (icon_image_ != NULL) ? *icon_image_ : SkBitmap(); |
244 } | 243 } |
OLD | NEW |