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

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

Issue 6368094: -Wuninitialized fixes 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
« no previous file with comments | « chrome/browser/sync/engine/syncer_thread.cc ('k') | chrome/common/autofill_messages.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/about_window_controller.h" 5 #import "chrome/browser/ui/cocoa/about_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 break; 515 break;
516 516
517 case kAutoupdatePromoting: 517 case kAutoupdatePromoting:
518 #if 1 518 #if 1
519 // TODO(mark): See the TODO in -adjustUpdateUIVisibility for an 519 // TODO(mark): See the TODO in -adjustUpdateUIVisibility for an
520 // explanation of why nothing can be done here at the moment. When 520 // explanation of why nothing can be done here at the moment. When
521 // KSRegistration handles promotion asynchronously, this dummy block can 521 // KSRegistration handles promotion asynchronously, this dummy block can
522 // be replaced with the #else block. For now, just leave the messaging 522 // be replaced with the #else block. For now, just leave the messaging
523 // alone. http://b/2290009. 523 // alone. http://b/2290009.
524 updateMessage = false; 524 updateMessage = false;
525 message = nil; // clang (no pr)
525 #else 526 #else
526 // The visibility may be changing. 527 // The visibility may be changing.
527 [self adjustUpdateUIVisibility]; 528 [self adjustUpdateUIVisibility];
528 529
529 // This is not a terminal state, and kAutoupdatePromoted or 530 // This is not a terminal state, and kAutoupdatePromoted or
530 // kAutoupdatePromoteFailed will follow. Use the throbber and 531 // kAutoupdatePromoteFailed will follow. Use the throbber and
531 // "checking" message so that it looks like something's happening. 532 // "checking" message so that it looks like something's happening.
532 throbber = true; 533 throbber = true;
533 message = l10n_util::GetNSStringWithFixup(IDS_UPGRADE_CHECK_STARTED); 534 message = l10n_util::GetNSStringWithFixup(IDS_UPGRADE_CHECK_STARTED);
534 #endif 535 #endif
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 NSRange string_range = NSMakeRange(0, [legal_block length]); 756 NSRange string_range = NSMakeRange(0, [legal_block length]);
756 [legal_block addAttribute:NSFontAttributeName 757 [legal_block addAttribute:NSFontAttributeName
757 value:[NSFont labelFontOfSize:11] 758 value:[NSFont labelFontOfSize:11]
758 range:string_range]; 759 range:string_range];
759 760
760 [legal_block endEditing]; 761 [legal_block endEditing];
761 return legal_block; 762 return legal_block;
762 } 763 }
763 764
764 @end // @implementation AboutWindowController 765 @end // @implementation AboutWindowController
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/syncer_thread.cc ('k') | chrome/common/autofill_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698