chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 6657003: Update a bunch of files to the new location of notification files.

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 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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 2b82cfc0c582e877e83776275d658c924b2c8891..2049fc0f13f0195b37cd061437b96c4cfbcde989 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

@@ -15,8 +15,8 @@

#import "chrome/browser/autocomplete/autocomplete_popup_model.h"

#include "chrome/browser/browser_list.h"

#include "chrome/browser/command_updater.h"

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

#include "chrome/browser/content_setting_bubble_model.h"

+#include "chrome/browser/content_setting_image_model.h"

#include "chrome/browser/defaults.h"

#include "chrome/browser/extensions/extension_browser_event_router.h"

#include "chrome/browser/extensions/extension_service.h"

@@ -43,12 +43,12 @@

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

#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 "content/common/notification_service.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

+#include "net/base/net_util.h"

#include "skia/ext/skia_utils_mac.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/l10n/l10n_util_mac.h"