chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm - Issue 284313008: Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

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/infobars/translate_infobar_base.mm

Issue 284313008: Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase + review comments Created 6 years, 7 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/infobars/translate_infobar_base.h ('k') | chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm

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

index b5be91b5c6ee12dc62b64ff5fa4e481970bd3a34..331b3dd5cd9704dd4b4833cb709787402dc9b9c7 100644

--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm

+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm

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

#include "base/logging.h"

#include "base/strings/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

-#include "chrome/browser/translate/translate_infobar_delegate.h"

+#import "chrome/browser/translate/translate_tab_helper.h"

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

#include "chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.h"

#import "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h"

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

#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"

#import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h"

#include "chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.h"

+#include "components/translate/core/browser/translate_infobar_delegate.h"

#include "grit/components_strings.h"

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

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

@@ -27,9 +28,8 @@ using InfoBarUtilities::VerifyControlOrderAndSpacing;

using InfoBarUtilities::CreateLabel;

using InfoBarUtilities::AddMenuItem;

-// static

-scoped_ptr<infobars::InfoBar> TranslateInfoBarDelegate::CreateInfoBar(

- scoped_ptr<TranslateInfoBarDelegate> delegate) {

+scoped_ptr<infobars::InfoBar> TranslateTabHelper::CreateInfoBar(

+ scoped_ptr<TranslateInfoBarDelegate> delegate) const {

scoped_ptr<InfoBarCocoa> infobar(

new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>()));

base::scoped_nsobject<TranslateInfoBarControllerBase> infobar_controller;