chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index 26b5806dea9a013b9ddcef8458065522c581d174..e97a749a778a63a88ff46adfa5b0144330d5b6eb 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -34,8 +34,8 @@

#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"

#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"

#import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"

-#import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h"

#import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"

+#import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h"

#import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"

#import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"

#import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h"

@@ -51,10 +51,10 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/extensions/extension.h"

#include "chrome/common/pref_names.h"

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

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

+#include "extensions/common/extension.h"

#include "extensions/common/feature_switch.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"