chrome/browser/ui/cocoa/toolbar/toolbar_controller.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/toolbar/toolbar_controller.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/theme_install_bubble_view.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

index 58280943b452303851ec918b82a5dcbb64cdd257..b04958a1e2642ef092a62fddadef2961ed8ffe1f 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -6,7 +6,6 @@

#include <algorithm>

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

#include "app/mac/nsimage_cache.h"

#include "base/mac/mac_util.h"

#include "base/singleton.h"

@@ -21,7 +20,6 @@

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

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

#include "chrome/browser/themes/browser_theme_provider.h"

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

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

#include "chrome/browser/ui/browser_window.h"

#import "chrome/browser/ui/cocoa/accelerators_cocoa.h"

@@ -42,21 +40,23 @@

#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

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

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

-#include "chrome/common/notification_details.h"

-#include "chrome/common/notification_observer.h"

-#include "chrome/common/notification_service.h"

-#include "chrome/common/notification_type.h"

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

#include "chrome/common/pref_names.h"

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

+#include "content/common/notification_details.h"

+#include "content/common/notification_observer.h"

+#include "content/common/notification_service.h"

+#include "content/common/notification_type.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

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

#include "ui/base/models/accelerator_cocoa.h"

#include "ui/base/models/menu_model.h"

#include "ui/base/resource/resource_bundle.h"

-#include "ui/gfx/rect.h"

#include "ui/gfx/image.h"

+#include "ui/gfx/rect.h"

namespace {