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

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

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more Created 7 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
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/website_settings_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #import <AppKit/AppKit.h> 9 #import <AppKit/AppKit.h>
10 10
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 } 379 }
380 380
381 // Create the subviews for the website settings bubble. 381 // Create the subviews for the website settings bubble.
382 - (void)initializeContents { 382 - (void)initializeContents {
383 // Keeps track of the position that the next control should be drawn at. 383 // Keeps track of the position that the next control should be drawn at.
384 NSPoint controlOrigin = NSMakePoint( 384 NSPoint controlOrigin = NSMakePoint(
385 kFramePadding, 385 kFramePadding,
386 kFramePadding + info_bubble::kBubbleArrowHeight); 386 kFramePadding + info_bubble::kBubbleArrowHeight);
387 387
388 // Create a text field (empty for now) to show the site identity. 388 // Create a text field (empty for now) to show the site identity.
389 identityField_ = [self addText:string16() 389 identityField_ = [self addText:base::string16()
390 withSize:[NSFont systemFontSize] 390 withSize:[NSFont systemFontSize]
391 bold:YES 391 bold:YES
392 toView:contentView_ 392 toView:contentView_
393 atPoint:controlOrigin]; 393 atPoint:controlOrigin];
394 controlOrigin.y += 394 controlOrigin.y +=
395 NSHeight([identityField_ frame]) + kConnectionHeadlineSpacing; 395 NSHeight([identityField_ frame]) + kConnectionHeadlineSpacing;
396 396
397 // Create a text field to identity status (e.g. verified, not verified). 397 // Create a text field to identity status (e.g. verified, not verified).
398 identityStatusField_ = [self addText:string16() 398 identityStatusField_ = [self addText:base::string16()
399 withSize:[NSFont smallSystemFontSize] 399 withSize:[NSFont smallSystemFontSize]
400 bold:NO 400 bold:NO
401 toView:contentView_ 401 toView:contentView_
402 atPoint:controlOrigin]; 402 atPoint:controlOrigin];
403 403
404 // Create the tab view and its two tabs. 404 // Create the tab view and its two tabs.
405 405
406 base::scoped_nsobject<WebsiteSettingsTabSegmentedCell> cell( 406 base::scoped_nsobject<WebsiteSettingsTabSegmentedCell> cell(
407 [[WebsiteSettingsTabSegmentedCell alloc] init]); 407 [[WebsiteSettingsTabSegmentedCell alloc] init]);
408 CGFloat tabstripHeight = [cell cellSize].height; 408 CGFloat tabstripHeight = [cell cellSize].height;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 NSPoint textPosition = NSMakePoint( 536 NSPoint textPosition = NSMakePoint(
537 kFramePadding + kConnectionImageSize + kConnectionImageSpacing, 537 kFramePadding + kConnectionImageSize + kConnectionImageSpacing,
538 kFramePadding); 538 kFramePadding);
539 NSPoint imagePosition = NSMakePoint(kFramePadding, kFramePadding); 539 NSPoint imagePosition = NSMakePoint(kFramePadding, kFramePadding);
540 NSSize imageSize = NSMakeSize(kConnectionImageSize, kConnectionImageSize); 540 NSSize imageSize = NSMakeSize(kConnectionImageSize, kConnectionImageSize);
541 541
542 identityStatusIcon_ = [self addImageWithSize:imageSize 542 identityStatusIcon_ = [self addImageWithSize:imageSize
543 toView:contentView 543 toView:contentView
544 atPoint:imagePosition]; 544 atPoint:imagePosition];
545 identityStatusDescriptionField_ = 545 identityStatusDescriptionField_ =
546 [self addText:string16() 546 [self addText:base::string16()
547 withSize:[NSFont smallSystemFontSize] 547 withSize:[NSFont smallSystemFontSize]
548 bold:NO 548 bold:NO
549 toView:contentView.get() 549 toView:contentView.get()
550 atPoint:textPosition]; 550 atPoint:textPosition];
551 551
552 separatorAfterIdentity_ = [self addSeparatorToView:contentView]; 552 separatorAfterIdentity_ = [self addSeparatorToView:contentView];
553 [separatorAfterIdentity_ setAutoresizingMask:NSViewWidthSizable]; 553 [separatorAfterIdentity_ setAutoresizingMask:NSViewWidthSizable];
554 554
555 connectionStatusIcon_ = [self addImageWithSize:imageSize 555 connectionStatusIcon_ = [self addImageWithSize:imageSize
556 toView:contentView 556 toView:contentView
557 atPoint:imagePosition]; 557 atPoint:imagePosition];
558 connectionStatusDescriptionField_ = 558 connectionStatusDescriptionField_ =
559 [self addText:string16() 559 [self addText:base::string16()
560 withSize:[NSFont smallSystemFontSize] 560 withSize:[NSFont smallSystemFontSize]
561 bold:NO 561 bold:NO
562 toView:contentView.get() 562 toView:contentView.get()
563 atPoint:textPosition]; 563 atPoint:textPosition];
564 certificateInfoButton_ = nil; // This will be created only if necessary. 564 certificateInfoButton_ = nil; // This will be created only if necessary.
565 separatorAfterConnection_ = [self addSeparatorToView:contentView]; 565 separatorAfterConnection_ = [self addSeparatorToView:contentView];
566 [separatorAfterConnection_ setAutoresizingMask:NSViewWidthSizable]; 566 [separatorAfterConnection_ setAutoresizingMask:NSViewWidthSizable];
567 567
568 firstVisitIcon_ = [self addImageWithSize:imageSize 568 firstVisitIcon_ = [self addImageWithSize:imageSize
569 toView:contentView 569 toView:contentView
570 atPoint:imagePosition]; 570 atPoint:imagePosition];
571 firstVisitHeaderField_ = 571 firstVisitHeaderField_ =
572 [self addText:l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE) 572 [self addText:l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE)
573 withSize:[NSFont smallSystemFontSize] 573 withSize:[NSFont smallSystemFontSize]
574 bold:YES 574 bold:YES
575 toView:contentView.get() 575 toView:contentView.get()
576 atPoint:textPosition]; 576 atPoint:textPosition];
577 firstVisitDescriptionField_ = 577 firstVisitDescriptionField_ =
578 [self addText:string16() 578 [self addText:base::string16()
579 withSize:[NSFont smallSystemFontSize] 579 withSize:[NSFont smallSystemFontSize]
580 bold:NO 580 bold:NO
581 toView:contentView.get() 581 toView:contentView.get()
582 atPoint:textPosition]; 582 atPoint:textPosition];
583 583
584 separatorAfterFirstVisit_ = [self addSeparatorToView:contentView]; 584 separatorAfterFirstVisit_ = [self addSeparatorToView:contentView];
585 [separatorAfterFirstVisit_ setAutoresizingMask:NSViewWidthSizable]; 585 [separatorAfterFirstVisit_ setAutoresizingMask:NSViewWidthSizable];
586 586
587 NSString* helpButtonText = l10n_util::GetNSString( 587 NSString* helpButtonText = l10n_util::GetNSString(
588 IDS_PAGE_INFO_HELP_CENTER_LINK); 588 IDS_PAGE_INFO_HELP_CENTER_LINK);
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 [bubble_controller_ setPermissionInfo:permission_info_list]; 1228 [bubble_controller_ setPermissionInfo:permission_info_list];
1229 } 1229 }
1230 1230
1231 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) { 1231 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) {
1232 [bubble_controller_ setFirstVisit:first_visit]; 1232 [bubble_controller_ setFirstVisit:first_visit];
1233 } 1233 }
1234 1234
1235 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1235 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1236 [bubble_controller_ setSelectedTab:tab_id]; 1236 [bubble_controller_ setSelectedTab:tab_id];
1237 } 1237 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm ('k') | chrome/browser/ui/search/instant_search_prerenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698