chrome/browser/ui/cocoa/global_error_bubble_controller.mm - Issue 368273011: Revert of Componentize TemplateURLService

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/global_error_bubble_controller.mm

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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/global_error_bubble_controller.mm

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

index f074c2742fc3ddc5f77db5bf889acecb6a223c4b..edfbff26da80c575df10a4c7171075daec23ea3d 100644

--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm

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

#include "base/strings/string_util.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/search_engines/util.h"

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

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

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

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

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

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

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

-#include "components/search_engines/util.h"

#include "grit/generated_resources.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

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