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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm

Issue 2221613002: [Mac] Fix hacker_case problems in Omnibox source. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm
index d0bc566e1074b3a2211451cffb443a73854d47cc..dd2166485cf30444ff7f9f21d88af4ae5c79b358 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm
@@ -33,7 +33,7 @@ const NSInteger kMiddleButtonNumber = 2;
answerImage:(NSImage*)answerImage {
base::scoped_nsobject<NSMutableArray> array([[NSMutableArray alloc] init]);
BOOL isDarkTheme = [tableView hasDarkTheme];
- CGFloat max_match_contents_width = 0.0f;
+ CGFloat maxMatchContentsWidth = 0.0f;
CGFloat contentsOffset = -1.0f;
for (const AutocompleteMatch& match : result) {
if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL &&
@@ -50,12 +50,12 @@ const NSInteger kMiddleButtonNumber = 2;
[cellData setIncognitoImage:popupView.ImageForMatch(match)];
[array addObject:cellData];
if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL) {
- max_match_contents_width =
- std::max(max_match_contents_width, [cellData getMatchContentsWidth]);
+ maxMatchContentsWidth =
+ std::max(maxMatchContentsWidth, [cellData getMatchContentsWidth]);
}
}
- [tableView setMaxMatchContentsWidth:max_match_contents_width];
+ [tableView setMaxMatchContentsWidth:maxMatchContentsWidth];
return [self initWithArray:array];
}
@@ -120,7 +120,7 @@ const NSInteger kMiddleButtonNumber = 2;
NSAttributedString* text = [cellData description];
// Provide no more than 3 lines of space.
rowRect.size.height =
- std::min(3, [cellData max_lines]) * [text size].height;
+ std::min(3, [cellData maxLines]) * [text size].height;
NSRect textRect =
[text boundingRectWithSize:rowRect.size
options:NSStringDrawingUsesLineFragmentOrigin |
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698