chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 6 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/omnibox/omnibox_popup_cell.h"	5 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9	9

10 #include "base/i18n/rtl.h"	10 #include "base/i18n/rtl.h"

11 #include "base/mac/scoped_nsobject.h"	11 #include "base/mac/scoped_nsobject.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

13 #include "base/strings/string_util.h"	13 #include "base/strings/string_util.h"

14 #include "base/strings/sys_string_conversions.h"	14 #include "base/strings/sys_string_conversions.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

	16 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"

16 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"	17 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

17 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"

18 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	18 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

19 #include "grit/generated_resources.h"	19 #include "chrome/grit/generated_resources.h"

20 #include "ui/base/l10n/l10n_util.h"	20 #include "ui/base/l10n/l10n_util.h"

21 #include "ui/gfx/font.h"	21 #include "ui/gfx/font.h"

22	22

23 namespace {	23 namespace {

24	24

25 // How far to offset image column from the left.	25 // How far to offset image column from the left.

26 const CGFloat kImageXOffset = 5.0;	26 const CGFloat kImageXOffset = 5.0;

27	27

28 // How far to offset the text column from the left.	28 // How far to offset the text column from the left.

29 const CGFloat kTextStartOffset = 28.0;	29 const CGFloat kTextStartOffset = 28.0;

(...skipping 380 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
410 }	410 }

411 glyphOffset -= minOffset;	411 glyphOffset -= minOffset;

412 if (glyphWidth == 0)	412 if (glyphWidth == 0)

413 glyphWidth = inputWidth - glyphOffset;	413 glyphWidth = inputWidth - glyphOffset;

414 if (isContentsRTL)	414 if (isContentsRTL)

415 glyphOffset += glyphWidth;	415 glyphOffset += glyphWidth;

416 return isRTL ? (inputWidth - glyphOffset) : glyphOffset;	416 return isRTL ? (inputWidth - glyphOffset) : glyphOffset;

417 }	417 }

418	418

419 @end	419 @end

OLD	NEW