chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 6598086: Update more includes that were pointing to the old locations.

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/location_bar/location_bar_view_mac.mm

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync Created 9 years, 10 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:

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 76500)

+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy)

@@ -25,8 +25,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_model.h"

-#include "chrome/browser/tab_contents/navigation_entry.h"

-#include "chrome/browser/tab_contents/tab_contents.h"

#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"

#include "chrome/browser/ui/cocoa/event_utils.h"

#import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

@@ -46,6 +44,8 @@

#include "chrome/common/extensions/extension_action.h"

#include "chrome/common/extensions/extension_resource.h"

#include "chrome/common/notification_service.h"

+#include "content/browser/tab_contents/navigation_entry.h"

+#include "content/browser/tab_contents/tab_contents.h"

#include "net/base/net_util.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"