Skip to content

GitLab

T
tangled
Commit b7508c7a authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot
Browse files
Options

[ios] Use local variables and "using" clause to improve formatting 

Use local variables to store the title for action injected to the
action menu controller and use "using" clause to reduce length of
the lines in order to improve formatting of the file.

Bug: none
Change-Id: Ia9a46cc8f666757097dd1adf49e8054d3bb74578
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544724
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSebastien Lalancette <seblalancette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828332}
parent d3c00e14
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 54 deletions
ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm
View file @ b7508c7a
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/l10n/l10n_util_mac.h"
using bookmarks::BookmarkNode; using bookmarks::BookmarkNode;
using l10n_util::GetNSString;
// Used to store a pair of NSIntegers when storing a NSIndexPath in C++ // Used to store a pair of NSIntegers when storing a NSIndexPath in C++
// collections. // collections.
...@@ -562,7 +563,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -562,7 +563,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
- (void)refreshContents { - (void)refreshContents {
if (self.sharedState.currentlyShowingSearchResults) { if (self.sharedState.currentlyShowingSearchResults) {
NSString* noResults = l10n_util::GetNSString(IDS_HISTORY_NO_SEARCH_RESULTS); NSString* noResults = GetNSString(IDS_HISTORY_NO_SEARCH_RESULTS);
[self.mediator computeBookmarkTableViewDataMatching:self.searchTerm [self.mediator computeBookmarkTableViewDataMatching:self.searchTerm
orShowMessageWhenNoResults:noResults]; orShowMessageWhenNoResults:noResults];
} else { } else {
...@@ -1106,12 +1107,12 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1106,12 +1107,12 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
- (UIBarButtonItem*)customizedDoneButton { - (UIBarButtonItem*)customizedDoneButton {
UIBarButtonItem* doneButton = [[UIBarButtonItem alloc] UIBarButtonItem* doneButton = [[UIBarButtonItem alloc]
initWithTitle:l10n_util::GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON) initWithTitle:GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)
style:UIBarButtonItemStyleDone style:UIBarButtonItemStyleDone
target:self target:self
action:@selector(navigationBarCancel:)]; action:@selector(navigationBarCancel:)];
doneButton.accessibilityLabel = doneButton.accessibilityLabel =
l10n_util::GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); GetNSString(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON);
doneButton.accessibilityIdentifier = doneButton.accessibilityIdentifier =
kBookmarkHomeNavigationBarDoneButtonIdentifier; kBookmarkHomeNavigationBarDoneButtonIdentifier;
return doneButton; return doneButton;
...@@ -1158,8 +1159,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1158,8 +1159,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
return; return;
} }
self.sharedState.addingNewFolder = YES; self.sharedState.addingNewFolder = YES;
base::string16 folderTitle = base::SysNSStringToUTF16( base::string16 folderTitle =
l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_GROUP_DEFAULT_NAME)); l10n_util::GetStringUTF16(IDS_IOS_BOOKMARK_NEW_GROUP_DEFAULT_NAME);
self.sharedState.editingFolderNode = self.sharedState.editingFolderNode =
self.sharedState.bookmarkModel->AddFolder( self.sharedState.bookmarkModel->AddFolder(
self.sharedState.tableViewDisplayedRootNode, self.sharedState.tableViewDisplayedRootNode,
...@@ -1494,8 +1495,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1494,8 +1495,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
self.emptyViewBackground = [[TableViewIllustratedEmptyView alloc] self.emptyViewBackground = [[TableViewIllustratedEmptyView alloc]
initWithFrame:self.sharedState.tableView.bounds initWithFrame:self.sharedState.tableView.bounds
image:[UIImage imageNamed:@"bookmark_empty"] image:[UIImage imageNamed:@"bookmark_empty"]
title:l10n_util::GetNSString(IDS_IOS_BOOKMARK_EMPTY_TITLE) title:GetNSString(IDS_IOS_BOOKMARK_EMPTY_TITLE)
subtitle:l10n_util::GetNSString(IDS_IOS_BOOKMARK_EMPTY_MESSAGE)]; subtitle:GetNSString(IDS_IOS_BOOKMARK_EMPTY_MESSAGE)];
} }
// If the Signin promo is visible on the root view, we have to shift the // If the Signin promo is visible on the root view, we have to shift the
// empty TableView background to make it fully visible on all devices. // empty TableView background to make it fully visible on all devices.
...@@ -1530,7 +1531,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1530,7 +1531,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
self.emptyTableBackgroundView.autoresizingMask = self.emptyTableBackgroundView.autoresizingMask =
UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth; UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
self.emptyTableBackgroundView.text = self.emptyTableBackgroundView.text =
l10n_util::GetNSString(IDS_IOS_BOOKMARK_NO_BOOKMARKS_LABEL); GetNSString(IDS_IOS_BOOKMARK_NO_BOOKMARKS_LABEL);
self.emptyTableBackgroundView.frame = self.sharedState.tableView.bounds; self.emptyTableBackgroundView.frame = self.sharedState.tableView.bounds;
} }
self.sharedState.tableView.backgroundView = self.emptyTableBackgroundView; self.sharedState.tableView.backgroundView = self.emptyTableBackgroundView;
...@@ -1676,8 +1677,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1676,8 +1677,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
- (void)setBookmarksContextBarButtonsDefaultState { - (void)setBookmarksContextBarButtonsDefaultState {
// Set New Folder button // Set New Folder button
NSString* titleString = NSString* titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_NEW_FOLDER);
l10n_util::GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_NEW_FOLDER);
UIBarButtonItem* newFolderButton = UIBarButtonItem* newFolderButton =
[[UIBarButtonItem alloc] initWithTitle:titleString [[UIBarButtonItem alloc] initWithTitle:titleString
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
...@@ -1694,7 +1694,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1694,7 +1694,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
action:nil]; action:nil];
// Set Edit button. // Set Edit button.
titleString = l10n_util::GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_EDIT); titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_EDIT);
UIBarButtonItem* editButton = UIBarButtonItem* editButton =
[[UIBarButtonItem alloc] initWithTitle:titleString [[UIBarButtonItem alloc] initWithTitle:titleString
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
...@@ -1715,8 +1715,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1715,8 +1715,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
- (void)setBookmarksContextBarSelectionStartState { - (void)setBookmarksContextBarSelectionStartState {
// Disabled Delete button. // Disabled Delete button.
NSString* titleString = NSString* titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_DELETE);
l10n_util::GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_DELETE);
self.deleteButton = self.deleteButton =
[[UIBarButtonItem alloc] initWithTitle:titleString [[UIBarButtonItem alloc] initWithTitle:titleString
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
...@@ -1728,7 +1727,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1728,7 +1727,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
kBookmarkHomeLeadingButtonIdentifier; kBookmarkHomeLeadingButtonIdentifier;
// Disabled More button. // Disabled More button.
titleString = l10n_util::GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_MORE); titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_BAR_MORE);
self.moreButton = self.moreButton =
[[UIBarButtonItem alloc] initWithTitle:titleString [[UIBarButtonItem alloc] initWithTitle:titleString
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
...@@ -1738,7 +1737,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1738,7 +1737,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
self.moreButton.accessibilityIdentifier = kBookmarkHomeCenterButtonIdentifier; self.moreButton.accessibilityIdentifier = kBookmarkHomeCenterButtonIdentifier;
// Enabled Cancel button. // Enabled Cancel button.
titleString = l10n_util::GetNSString(IDS_CANCEL); titleString = GetNSString(IDS_CANCEL);
UIBarButtonItem* cancelButton = UIBarButtonItem* cancelButton =
[[UIBarButtonItem alloc] initWithTitle:titleString [[UIBarButtonItem alloc] initWithTitle:titleString
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
...@@ -1766,8 +1765,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1766,8 +1765,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
coordinator.alertController.view.accessibilityIdentifier = coordinator.alertController.view.accessibilityIdentifier =
kBookmarkHomeContextMenuIdentifier; kBookmarkHomeContextMenuIdentifier;
[coordinator addItemWithTitle:l10n_util::GetNSString( NSString* titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_OPEN);
IDS_IOS_BOOKMARK_CONTEXT_MENU_OPEN) [coordinator addItemWithTitle:titleString
action:^{ action:^{
BookmarkHomeViewController* strongSelf = weakSelf; BookmarkHomeViewController* strongSelf = weakSelf;
if (!strongSelf) if (!strongSelf)
...@@ -1780,21 +1779,22 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1780,21 +1779,22 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
} }
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
[coordinator titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_OPEN_INCOGNITO);
addItemWithTitle:l10n_util::GetNSString( [coordinator addItemWithTitle:titleString
IDS_IOS_BOOKMARK_CONTEXT_MENU_OPEN_INCOGNITO)
action:^{ action:^{
BookmarkHomeViewController* strongSelf = weakSelf; BookmarkHomeViewController* strongSelf = weakSelf;
if (!strongSelf) if (!strongSelf)
return; return;
std::vector<const BookmarkNode*> nodes = std::vector<const BookmarkNode*> nodes =
[strongSelf editNodes]; [strongSelf editNodes];
[strongSelf openAllNodes:nodes inIncognito:YES newTab:NO]; [strongSelf openAllNodes:nodes
inIncognito:YES
newTab:NO];
} }
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
[coordinator addItemWithTitle:l10n_util::GetNSString( titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE);
IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE) [coordinator addItemWithTitle:titleString
action:^{ action:^{
[weakSelf moveNodes:nodes]; [weakSelf moveNodes:nodes];
} }
...@@ -1808,8 +1808,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1808,8 +1808,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
coordinator.alertController.view.accessibilityIdentifier = coordinator.alertController.view.accessibilityIdentifier =
kBookmarkHomeContextMenuIdentifier; kBookmarkHomeContextMenuIdentifier;
[coordinator addItemWithTitle:l10n_util::GetNSString( NSString* titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_EDIT);
IDS_IOS_BOOKMARK_CONTEXT_MENU_EDIT) [coordinator addItemWithTitle:titleString
action:^{ action:^{
[weakSelf editNode:node]; [weakSelf editNode:node];
} }
...@@ -1822,8 +1822,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1822,8 +1822,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
coordinator.alertController.actions[0].enabled = NO; coordinator.alertController.actions[0].enabled = NO;
} }
[coordinator addItemWithTitle:l10n_util::GetNSString( titleString = GetNSString(IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWTAB);
IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWTAB) [coordinator addItemWithTitle:titleString
action:^{ action:^{
std::vector<const BookmarkNode*> nodes = {node}; std::vector<const BookmarkNode*> nodes = {node};
[weakSelf openAllNodes:nodes [weakSelf openAllNodes:nodes
...@@ -1833,8 +1833,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1833,8 +1833,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
if (IsMultipleScenesSupported()) { if (IsMultipleScenesSupported()) {
NSString* title = titleString = GetNSString(IDS_IOS_CONTENT_CONTEXT_OPENINNEWWINDOW);
l10n_util::GetNSString(IDS_IOS_CONTENT_CONTEXT_OPENINNEWWINDOW);
id<ApplicationCommands> windowOpener = HandlerForProtocol( id<ApplicationCommands> windowOpener = HandlerForProtocol(
self.browser->GetCommandDispatcher(), ApplicationCommands); self.browser->GetCommandDispatcher(), ApplicationCommands);
auto action = ^{ auto action = ^{
...@@ -1842,22 +1841,24 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1842,22 +1841,24 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
WindowActivityBookmarksOrigin, WindowActivityBookmarksOrigin,
node->url())]; node->url())];
}; };
[coordinator addItemWithTitle:title [coordinator addItemWithTitle:titleString
action:action action:action
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
} }
[coordinator titleString = GetNSString(IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWINCOGNITOTAB);
addItemWithTitle:l10n_util::GetNSString( [coordinator addItemWithTitle:titleString
IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWINCOGNITOTAB)
action:^{ action:^{
std::vector<const BookmarkNode*> nodes = {node}; std::vector<const BookmarkNode*> nodes = {node};
[weakSelf openAllNodes:nodes inIncognito:YES newTab:YES]; [weakSelf openAllNodes:nodes
inIncognito:YES
newTab:YES];
} }
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
titleString = GetNSString(IDS_IOS_CONTENT_CONTEXT_COPY);
[coordinator [coordinator
addItemWithTitle:l10n_util::GetNSString(IDS_IOS_CONTENT_CONTEXT_COPY) addItemWithTitle:titleString
action:^{ action:^{
// Use strongSelf even though the object is only used once // Use strongSelf even though the object is only used once
// because we do not want to change the global pasteboard // because we do not want to change the global pasteboard
...@@ -1878,15 +1879,16 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1878,15 +1879,16 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
coordinator.alertController.view.accessibilityIdentifier = coordinator.alertController.view.accessibilityIdentifier =
kBookmarkHomeContextMenuIdentifier; kBookmarkHomeContextMenuIdentifier;
[coordinator addItemWithTitle:l10n_util::GetNSString( NSString* titleString =
IDS_IOS_BOOKMARK_CONTEXT_MENU_EDIT_FOLDER) GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_EDIT_FOLDER);
[coordinator addItemWithTitle:titleString
action:^{ action:^{
[weakSelf editNode:node]; [weakSelf editNode:node];
} }
style:UIAlertActionStyleDefault]; style:UIAlertActionStyleDefault];
[coordinator addItemWithTitle:l10n_util::GetNSString( titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE);
IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE) [coordinator addItemWithTitle:titleString
action:^{ action:^{
std::set<const BookmarkNode*> nodes{node}; std::set<const BookmarkNode*> nodes{node};
[weakSelf moveNodes:nodes]; [weakSelf moveNodes:nodes];
...@@ -1909,8 +1911,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -1909,8 +1911,8 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
coordinator.alertController.view.accessibilityIdentifier = coordinator.alertController.view.accessibilityIdentifier =
kBookmarkHomeContextMenuIdentifier; kBookmarkHomeContextMenuIdentifier;
[coordinator addItemWithTitle:l10n_util::GetNSString( NSString* titleString = GetNSString(IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE);
IDS_IOS_BOOKMARK_CONTEXT_MENU_MOVE) [coordinator addItemWithTitle:titleString
action:^{ action:^{
[weakSelf moveNodes:nodes]; [weakSelf moveNodes:nodes];
} }
...@@ -2016,7 +2018,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -2016,7 +2018,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
// Replace current list with search result, but doesn't change // Replace current list with search result, but doesn't change
// the 'regular' model for this page, which we can restore when search // the 'regular' model for this page, which we can restore when search
// is terminated. // is terminated.
NSString* noResults = l10n_util::GetNSString(IDS_HISTORY_NO_SEARCH_RESULTS); NSString* noResults = GetNSString(IDS_HISTORY_NO_SEARCH_RESULTS);
[self.mediator computeBookmarkTableViewDataMatching:text [self.mediator computeBookmarkTableViewDataMatching:text
orShowMessageWhenNoResults:noResults]; orShowMessageWhenNoResults:noResults];
[self.sharedState.tableView reloadData]; [self.sharedState.tableView reloadData];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment