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

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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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: rebase 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 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') | chrome/browser/ui/cocoa/one_click_signin_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

index b95f26a94fca8c734a1e2059968035d0dcc72d27..d454f8bd96ea1750ee3b5b309b1bebc3eb780c2b 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

@@ -20,12 +20,12 @@

#include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"

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

#include "chrome/browser/ui/toolbar/toolbar_model.h"

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

#include "components/omnibox/autocomplete_input.h"

#include "components/omnibox/autocomplete_match.h"

#include "components/omnibox/omnibox_field_trial.h"

#include "content/public/browser/web_contents.h"

#include "extensions/common/constants.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#import "third_party/mozilla/NSPasteboard+Utils.h"

#include "ui/base/clipboard/clipboard.h"