chrome/browser/ui/views/infobars/translate_infobar_base.cc - 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/views/infobars/translate_infobar_base.cc

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/views/infobars/before_translate_infobar.cc ('k') | chrome/browser/ui/views/infobars/translate_language_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/infobars/translate_infobar_base.cc

diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc

index 5227ce03915cbb920b334140da77732bd764221b..5f1a753aebe37dcaa8753023c318c6e71f2bda68 100644

--- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc

+++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc

@@ -5,12 +5,12 @@

#include "chrome/browser/ui/views/infobars/translate_infobar_base.h"

#include "base/strings/utf_string_conversions.h"

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

#include "chrome/browser/translate/translate_tab_helper.h"

#include "chrome/browser/ui/views/infobars/after_translate_infobar.h"

#include "chrome/browser/ui/views/infobars/before_translate_infobar.h"

#include "chrome/browser/ui/views/infobars/translate_message_infobar.h"

#include "components/infobars/core/infobar.h"

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

#include "grit/theme_resources.h"

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

#include "ui/gfx/animation/slide_animation.h"

@@ -19,11 +19,10 @@

#include "ui/views/controls/label.h"

-// TranslateInfoBarDelegate ---------------------------------------------------

+// TranslateTabHelper ----------------------------------------------------------

-// static

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

- scoped_ptr<TranslateInfoBarDelegate> delegate) {

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

+ scoped_ptr<TranslateInfoBarDelegate> delegate) const {

if (delegate->translate_step() ==

translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {

return scoped_ptr<infobars::InfoBar>(