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

Side by Side Diff: chrome/browser/cocoa/about_window_controller.mm

Issue 443026: Merge r32598 to the 249 branch.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/
Patch Set: Created 11 years 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
« no previous file with comments | « chrome/browser/cocoa/about_window_controller.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "app/l10n_util_mac.h" 5 #include "app/l10n_util_mac.h"
6 #include "app/resource_bundle.h" 6 #include "app/resource_bundle.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac_util.h" 8 #include "base/mac_util.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // These methods maintain the image (or throbber) and text displayed regarding 66 // These methods maintain the image (or throbber) and text displayed regarding
67 // update status. -setUpdateThrobberMessage: starts a progress throbber and 67 // update status. -setUpdateThrobberMessage: starts a progress throbber and
68 // sets the text. -setUpdateImage:message: displays an image and sets the 68 // sets the text. -setUpdateImage:message: displays an image and sets the
69 // text. 69 // text.
70 - (void)setUpdateThrobberMessage:(NSString*)message; 70 - (void)setUpdateThrobberMessage:(NSString*)message;
71 - (void)setUpdateImage:(int)imageID message:(NSString*)message; 71 - (void)setUpdateImage:(int)imageID message:(NSString*)message;
72 72
73 @end // @interface AboutWindowController(Private) 73 @end // @interface AboutWindowController(Private)
74 74
75 const NSString* const kUserClosedAboutNotification = 75 @implementation AboutLegalTextView
76 @"UserClosedAboutNotification"; 76
77 // Never draw the insertion point (otherwise, it shows up without any user
78 // action if full keyboard accessibility is enabled).
79 - (BOOL)shouldDrawInsertionPoint {
80 return NO;
81 }
82
83 @end
77 84
78 @implementation AboutWindowController 85 @implementation AboutWindowController
79 86
80 - (id)initWithProfile:(Profile*)profile { 87 - (id)initWithProfile:(Profile*)profile {
81 NSString* nibPath = [mac_util::MainAppBundle() pathForResource:@"About" 88 NSString* nibPath = [mac_util::MainAppBundle() pathForResource:@"About"
82 ofType:@"nib"]; 89 ofType:@"nib"];
83 if ((self = [super initWithWindowNibPath:nibPath owner:self])) { 90 if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
84 profile_ = profile; 91 profile_ = profile;
85 NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; 92 NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
86 [center addObserver:self 93 [center addObserver:self
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 NSRange string_range = NSMakeRange(0, [legal_block length]); 487 NSRange string_range = NSMakeRange(0, [legal_block length]);
481 [legal_block addAttribute:NSFontAttributeName 488 [legal_block addAttribute:NSFontAttributeName
482 value:[NSFont labelFontOfSize:11] 489 value:[NSFont labelFontOfSize:11]
483 range:string_range]; 490 range:string_range];
484 491
485 [legal_block endEditing]; 492 [legal_block endEditing];
486 return legal_block; 493 return legal_block;
487 } 494 }
488 495
489 @end // @implementation AboutWindowController 496 @end // @implementation AboutWindowController
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/about_window_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698