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

Side by Side Diff: chrome/browser/speech/speech_recognition_bubble.h

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ 5 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_
6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ 6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 // The current microphone image with volume level indication. 178 // The current microphone image with volume level indication.
179 scoped_ptr<SkBitmap> mic_image_; 179 scoped_ptr<SkBitmap> mic_image_;
180 // A temporary buffer image used in creating the above mic image. 180 // A temporary buffer image used in creating the above mic image.
181 scoped_ptr<SkBitmap> buffer_image_; 181 scoped_ptr<SkBitmap> buffer_image_;
182 // WebContents in which this this bubble gets displayed. 182 // WebContents in which this this bubble gets displayed.
183 content::WebContents* web_contents_; 183 content::WebContents* web_contents_;
184 // The current image displayed in the bubble's icon widget. 184 // The current image displayed in the bubble's icon widget.
185 gfx::ImageSkia icon_image_; 185 gfx::ImageSkia icon_image_;
186 // The scale factor used for the web-contents. 186 // The scale factor used for the web-contents.
187 ui::ScaleFactor scale_factor_; 187 float scale_;
188 188
189 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionBubbleBase); 189 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionBubbleBase);
190 }; 190 };
191 191
192 // This typedef is to workaround the issue with certain versions of 192 // This typedef is to workaround the issue with certain versions of
193 // Visual Studio where it gets confused between multiple Delegate 193 // Visual Studio where it gets confused between multiple Delegate
194 // classes and gives a C2500 error. (I saw this error on the try bots - 194 // classes and gives a C2500 error. (I saw this error on the try bots -
195 // the workaround was not needed for my machine). 195 // the workaround was not needed for my machine).
196 typedef SpeechRecognitionBubble::Delegate SpeechRecognitionBubbleDelegate; 196 typedef SpeechRecognitionBubble::Delegate SpeechRecognitionBubbleDelegate;
197 197
198 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ 198 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_info_util.cc ('k') | chrome/browser/speech/speech_recognition_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698