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

Side by Side Diff: chrome/browser/ui/cocoa/speech_input_window_controller.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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) 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 #import "speech_input_window_controller.h" 5 #import "speech_input_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/browser/ui/cocoa/info_bubble_view.h" 9 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
11 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
12 #import "skia/ext/skia_utils_mac.h" 12 #import "skia/ext/skia_utils_mac.h"
13 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 13 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
14 #include "ui/base/l10n/l10n_util_mac.h" 14 #include "ui/base/l10n/l10n_util_mac.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/image.h"
16 17
17 const int kBubbleControlVerticalSpacing = 10; // Space between controls. 18 const int kBubbleControlVerticalSpacing = 10; // Space between controls.
18 const int kBubbleHorizontalMargin = 5; // Space on either sides of controls. 19 const int kBubbleHorizontalMargin = 5; // Space on either sides of controls.
19 20
20 @interface SpeechInputWindowController (Private) 21 @interface SpeechInputWindowController (Private)
21 - (NSSize)calculateContentSize; 22 - (NSSize)calculateContentSize;
22 - (void)layout:(NSSize)size; 23 - (void)layout:(NSSize)size;
23 @end 24 @end
24 25
25 @implementation SpeechInputWindowController 26 @implementation SpeechInputWindowController
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 178
178 - (void)hide { 179 - (void)hide {
179 [[self window] orderOut:nil]; 180 [[self window] orderOut:nil];
180 } 181 }
181 182
182 - (void)setImage:(NSImage*)image { 183 - (void)setImage:(NSImage*)image {
183 [iconImage_ setImage:image]; 184 [iconImage_ setImage:image];
184 } 185 }
185 186
186 @end // implementation SpeechInputWindowController 187 @end // implementation SpeechInputWindowController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698