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

Side by Side Diff: chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.mm

Issue 11077006: Correct padding and focus ring for frameless constrained window dialog (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix license header Created 8 years, 2 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
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 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller. h" 5 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller. h"
6 6
7 #import "chrome/browser/ui/constrained_window.h" 7 #import "chrome/browser/ui/constrained_window.h"
8 #import "chrome/browser/ui/constrained_window_constants.h"
8 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h" 9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u tils.h" 10 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u tils.h"
10 #import "chrome/browser/ui/cocoa/flipped_view.h" 11 #import "chrome/browser/ui/cocoa/flipped_view.h"
11 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" 12 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
12 #import "chrome/browser/ui/cocoa/ratings_view.h" 13 #import "chrome/browser/ui/cocoa/ratings_view.h"
13 #import "chrome/browser/ui/intents/web_intent_picker.h" 14 #import "chrome/browser/ui/intents/web_intent_picker.h"
14 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
15 #include "grit/google_chrome_strings.h" 16 #include "grit/google_chrome_strings.h"
16 #include "ui/base/l10n/l10n_util_mac.h" 17 #include "ui/base/l10n/l10n_util_mac.h"
17 #include "skia/ext/skia_utils_mac.h" 18 #include "skia/ext/skia_utils_mac.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 [[titleLinkButton_ cell] setTextColor: 175 [[titleLinkButton_ cell] setTextColor:
175 gfx::SkColorToCalibratedNSColor(ConstrainedWindow::GetTextColor())]; 176 gfx::SkColorToCalibratedNSColor(ConstrainedWindow::GetTextColor())];
176 [[titleTextField_ cell] setLineBreakMode:NSLineBreakByTruncatingTail]; 177 [[titleTextField_ cell] setLineBreakMode:NSLineBreakByTruncatingTail];
177 [titleLinkButton_ sizeToFit]; 178 [titleLinkButton_ sizeToFit];
178 [[self view] addSubview:titleLinkButton_]; 179 [[self view] addSubview:titleLinkButton_];
179 } else { 180 } else {
180 titleTextField_.reset([constrained_window::CreateLabel() retain]); 181 titleTextField_.reset([constrained_window::CreateLabel() retain]);
181 [titleTextField_ setAttributedStringValue: 182 [titleTextField_ setAttributedStringValue:
182 constrained_window::GetAttributedLabelString( 183 constrained_window::GetAttributedLabelString(
183 title, 184 title,
184 ConstrainedWindow::kTextFontStyle, 185 ConstrainedWindowConstants::kTextFontStyle,
185 NSNaturalTextAlignment, 186 NSNaturalTextAlignment,
186 NSLineBreakByTruncatingTail)]; 187 NSLineBreakByTruncatingTail)];
187 [titleTextField_ sizeToFit]; 188 [titleTextField_ sizeToFit];
188 [[self view] addSubview:titleTextField_]; 189 [[self view] addSubview:titleTextField_];
189 } 190 }
190 191
191 selectButton_.reset( 192 selectButton_.reset(
192 [[ConstrainedWindowButton alloc] initWithFrame:NSZeroRect]); 193 [[ConstrainedWindowButton alloc] initWithFrame:NSZeroRect]);
193 [selectButton_ setTitle:buttonTitle]; 194 [selectButton_ setTitle:buttonTitle];
194 [[self view] addSubview:selectButton_]; 195 [[self view] addSubview:selectButton_];
195 196
196 iconView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]); 197 iconView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]);
197 [iconView_ setImage:icon]; 198 [iconView_ setImage:icon];
198 [iconView_ setImageFrameStyle:NSImageFrameNone]; 199 [iconView_ setImageFrameStyle:NSImageFrameNone];
199 [[self view] addSubview:iconView_]; 200 [[self view] addSubview:iconView_];
200 } 201 }
201 202
202 @end 203 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698