chrome/browser/ui/views/infobars/translate_message_infobar.cc - Issue 284313008: Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/infobars/translate_message_infobar.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, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/infobars/translate_language_menu_model.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "chrome/browser/translate/translate_infobar_delegate.h"	7 #include "components/translate/core/browser/translate_infobar_delegate.h"

8 #include "ui/views/controls/button/label_button.h"	8 #include "ui/views/controls/button/label_button.h"

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

10	10

11 TranslateMessageInfoBar::TranslateMessageInfoBar(	11 TranslateMessageInfoBar::TranslateMessageInfoBar(

12 scoped_ptr<TranslateInfoBarDelegate> delegate)	12 scoped_ptr<TranslateInfoBarDelegate> delegate)

13 : TranslateInfoBarBase(delegate.Pass()),	13 : TranslateInfoBarBase(delegate.Pass()),

14 label_(NULL),	14 label_(NULL),

15 button_(NULL) {	15 button_(NULL) {

16 }	16 }

17	17

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63	63

64 int TranslateMessageInfoBar::ContentMinimumWidth() const {	64 int TranslateMessageInfoBar::ContentMinimumWidth() const {

65 return label_->GetMinimumSize().width() + NonLabelWidth();	65 return label_->GetMinimumSize().width() + NonLabelWidth();

66 }	66 }

67	67

68 int TranslateMessageInfoBar::NonLabelWidth() const {	68 int TranslateMessageInfoBar::NonLabelWidth() const {

69 if (!button_)	69 if (!button_)

70 return 0;	70 return 0;

71 return button_->width() + (label_->text().empty() ? 0 : kEndOfLabelSpacing);	71 return button_->width() + (label_->text().empty() ? 0 : kEndOfLabelSpacing);

72 }	72 }

OLD	NEW