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

Unified Diff: ui/app_list/cocoa/signin_view_controller.mm

Issue 309443002: Remove need to sign in to use the App Launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: ui/app_list/cocoa/signin_view_controller.mm
diff --git a/ui/app_list/cocoa/signin_view_controller.mm b/ui/app_list/cocoa/signin_view_controller.mm
deleted file mode 100644
index bd2023ac8df9713b78992f73cd21012835fecf6b..0000000000000000000000000000000000000000
--- a/ui/app_list/cocoa/signin_view_controller.mm
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "ui/app_list/cocoa/signin_view_controller.h"
-
-#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
-#include "base/strings/sys_string_conversions.h"
-#include "skia/ext/skia_utils_mac.h"
-#include "third_party/skia/include/core/SkColor.h"
-#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
-#include "ui/app_list/app_list_constants.h"
-#include "ui/app_list/signin_delegate.h"
-#import "ui/base/cocoa/controls/blue_label_button.h"
-#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
-#include "ui/base/resource/resource_bundle.h"
-
-namespace {
-
-const CGFloat kTopPadding = 40;
-const CGFloat kBottomPadding = 40;
-const CGFloat kLeftPadding = 40;
-const CGFloat kRightPadding = 40;
-const CGFloat kHeadingPadding = 30;
-const CGFloat kButtonPadding = 40;
-
-const CGFloat kTitleFontSizeDelta = 5;
-const SkColor kLinkColor = SkColorSetRGB(0x11, 0x55, 0xcc);
-const SkColor kTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
-
-// Padding on the left of the text in the NSTextField and HyperlinkButtonCell.
-const CGFloat kTextFieldPadding = 2;
-
-} // namespace
-
-@interface SigninViewController ()
-
-- (void)onLearnMoreButtonClick:(id)sender;
-- (void)onSettingsButtonClick:(id)sender;
-- (void)onSigninButtonClick:(id)sender;
-- (NSButton*)makeLinkButtonWithTitle:(NSString*)title
- origin:(NSPoint)origin
- action:(SEL)action;
-- (NSTextField*)makeTextFieldWithText:(NSString*)text
- font:(NSFont*)font
- frame:(NSRect)frame;
-- (void)populateAndLayoutView;
-
-@end
-
-@interface AppsSigninView : NSView {
- @private
- CGFloat cornerRadius_;
-}
-
-@property(assign, nonatomic) CGFloat cornerRadius;
-
-@end
-
-@implementation SigninViewController;
-
-- (id)initWithFrame:(NSRect)frame
- cornerRadius:(CGFloat)cornerRadius
- delegate:(app_list::SigninDelegate*)delegate {
- if ((self = [super init])) {
- base::scoped_nsobject<AppsSigninView> appsSigninView(
- [[AppsSigninView alloc] initWithFrame:frame]);
- [appsSigninView setCornerRadius:cornerRadius];
- delegate_ = delegate;
- [self setView:appsSigninView];
- [self populateAndLayoutView];
- }
- return self;
-}
-
-- (void)onLearnMoreButtonClick:(id)sender {
- delegate_->OpenLearnMore();
-}
-
-- (void)onSettingsButtonClick:(id)sender {
- delegate_->OpenSettings();
-}
-
-- (void)onSigninButtonClick:(id)sender {
- delegate_->ShowSignin();
-}
-
-- (NSButton*)makeLinkButtonWithTitle:(NSString*)title
- origin:(NSPoint)origin
- action:(SEL)action {
- base::scoped_nsobject<NSButton> button(
- [[HyperlinkButtonCell buttonWithString:title] retain]);
- [[button cell] setShouldUnderline:NO];
- [[button cell] setTextColor:gfx::SkColorToSRGBNSColor(kLinkColor)];
- [button sizeToFit];
- origin.x -= kTextFieldPadding;
- [button setFrameOrigin:origin];
- [button setTarget:self];
- [button setAction:action];
- return button.autorelease();
-}
-
-- (NSTextField*)makeTextFieldWithText:(NSString*)text
- font:(NSFont*)font
- frame:(NSRect)frame {
- base::scoped_nsobject<NSTextField> textField(
- [[NSTextField alloc] initWithFrame:frame]);
- [textField setEditable:NO];
- [textField setSelectable:NO];
- [textField setDrawsBackground:NO];
- [textField setBezeled:NO];
-
- NSDictionary* textAttributes = @{
- NSFontAttributeName : font,
- NSForegroundColorAttributeName : gfx::SkColorToSRGBNSColor(kTextColor)
- };
- base::scoped_nsobject<NSAttributedString> attributedText(
- [[NSAttributedString alloc] initWithString:text
- attributes:textAttributes]);
- [textField setAttributedStringValue:attributedText];
- [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:textField];
- NSPoint origin = [textField frame].origin;
- origin.x -= kTextFieldPadding;
- origin.y -= NSHeight([textField bounds]);
- [textField setFrameOrigin:origin];
- return textField.autorelease();
-}
-
-- (void)populateAndLayoutView {
- NSView* signinView = [self view];
- NSRect frame = [signinView frame];
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- const gfx::FontList& baseFontList =
- rb.GetFontList(ui::ResourceBundle::BaseFont);
-
- NSString* titleText = base::SysUTF16ToNSString(delegate_->GetSigninHeading());
- NSFont* titleFont = baseFontList.DeriveWithSizeDelta(kTitleFontSizeDelta)
- .GetPrimaryFont().GetNativeFont();
- NSRect rect = NSMakeRect(kLeftPadding, NSHeight(frame) - kTopPadding,
- NSWidth(frame) - kLeftPadding - kRightPadding, 0);
- NSTextField* titleTextView = [self makeTextFieldWithText:titleText
- font:titleFont
- frame:rect];
- [signinView addSubview:titleTextView];
-
- NSString* signinText = base::SysUTF16ToNSString(delegate_->GetSigninText());
- rect.origin.y = floor(
- NSMinY([titleTextView frame]) + [titleFont descender] - kHeadingPadding);
- NSFont* signinTextFont = baseFontList.GetPrimaryFont().GetNativeFont();
- NSTextField* signinTextView = [self makeTextFieldWithText:signinText
- font:signinTextFont
- frame:rect];
- [signinView addSubview:signinTextView];
-
- base::scoped_nsobject<BlueLabelButton> button(
- [[BlueLabelButton alloc] initWithFrame:NSZeroRect]);
- [button setTitle:base::SysUTF16ToNSString(delegate_->GetSigninButtonText())];
- [button setKeyEquivalent:@"\r"];
- [button setTarget:self];
- [button setAction:@selector(onSigninButtonClick:)];
- [button sizeToFit];
- NSPoint buttonOrigin = NSMakePoint(kLeftPadding, floor(
- NSMinY([signinTextView frame]) - [signinTextFont descender] -
- NSHeight([button frame]) - kButtonPadding));
- [button setFrameOrigin:buttonOrigin];
- [signinView addSubview:button];
-
- NSString* settingsLinkText =
- base::SysUTF16ToNSString(delegate_->GetSettingsLinkText());
- NSButton* settingsLink =
- [self makeLinkButtonWithTitle:settingsLinkText
- origin:NSMakePoint(kLeftPadding, kBottomPadding)
- action:@selector(onSettingsButtonClick:)];
- NSPoint origin = NSMakePoint(kLeftPadding,
- NSMaxY([settingsLink frame]));
- NSString* learnMoreLinkText =
- base::SysUTF16ToNSString(delegate_->GetLearnMoreLinkText());
- NSButton* learnMoreLink =
- [self makeLinkButtonWithTitle:learnMoreLinkText
- origin:origin
- action:@selector(onLearnMoreButtonClick:)];
- [signinView addSubview:learnMoreLink];
- [signinView addSubview:settingsLink];
-}
-
-@end
-
-@implementation AppsSigninView
-
-@synthesize cornerRadius = cornerRadius_;
-
-- (void)drawRect:(NSRect)dirtyRect {
- [gfx::SkColorToSRGBNSColor(app_list::kContentsBackgroundColor) set];
- [[NSBezierPath bezierPathWithRoundedRect:[self bounds]
- xRadius:cornerRadius_
- yRadius:cornerRadius_] fill];
-}
-
-@end

Powered by Google App Engine
This is Rietveld 408576698