Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1207)

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

Issue 7300018: Revert 91390 (build breakage) - Convert ViewMsg_NetworkStateChanged from routed -> control (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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
OLDNEW
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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/tab_contents/web_drag_dest_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698