| Index: chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| index a22b4dadd9e599a90fbf497cde8afdb99e5c8592..7df866f2e3016348c5696baaa4e942489f9a3909 100644
|
| --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| @@ -80,10 +80,11 @@ TranslateBubbleView::~TranslateBubbleView() {
|
| }
|
|
|
| // static
|
| -void TranslateBubbleView::ShowBubble(views::View* anchor_view,
|
| - content::WebContents* web_contents,
|
| - translate::TranslateStep step,
|
| - TranslateErrors::Type error_type) {
|
| +void TranslateBubbleView::ShowBubble(
|
| + views::View* anchor_view,
|
| + content::WebContents* web_contents,
|
| + translate::TranslateStep step,
|
| + translate::TranslateErrors::Type error_type) {
|
| if (IsShowing()) {
|
| // When the user reads the advanced setting panel, the bubble should not be
|
| // changed because he/she is focusing on the bubble.
|
| @@ -107,11 +108,12 @@ void TranslateBubbleView::ShowBubble(views::View* anchor_view,
|
| ChromeTranslateClient::GetTranslateLanguages(
|
| web_contents, &source_language, &target_language);
|
|
|
| - scoped_ptr<TranslateUIDelegate> ui_delegate(new TranslateUIDelegate(
|
| - ChromeTranslateClient::GetManagerFromWebContents(web_contents)
|
| - ->GetWeakPtr(),
|
| - source_language,
|
| - target_language));
|
| + scoped_ptr<translate::TranslateUIDelegate> ui_delegate(
|
| + new translate::TranslateUIDelegate(
|
| + ChromeTranslateClient::GetManagerFromWebContents(web_contents)
|
| + ->GetWeakPtr(),
|
| + source_language,
|
| + target_language));
|
| scoped_ptr<TranslateBubbleModel> model(
|
| new TranslateBubbleModelImpl(step, ui_delegate.Pass()));
|
| TranslateBubbleView* view = new TranslateBubbleView(anchor_view,
|
| @@ -238,7 +240,7 @@ TranslateBubbleModel::ViewState TranslateBubbleView::GetViewState() const {
|
| TranslateBubbleView::TranslateBubbleView(
|
| views::View* anchor_view,
|
| scoped_ptr<TranslateBubbleModel> model,
|
| - TranslateErrors::Type error_type,
|
| + translate::TranslateErrors::Type error_type,
|
| content::WebContents* web_contents)
|
| : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
|
| WebContentsObserver(web_contents),
|
| @@ -256,8 +258,8 @@ TranslateBubbleView::TranslateBubbleView(
|
| model_(model.Pass()),
|
| error_type_(error_type),
|
| is_in_incognito_window_(
|
| - web_contents ?
|
| - web_contents->GetBrowserContext()->IsOffTheRecord() : false),
|
| + web_contents ? web_contents->GetBrowserContext()->IsOffTheRecord()
|
| + : false),
|
| translate_executed_(false),
|
| denial_button_clicked_(false) {
|
| if (model_->GetViewState() !=
|
| @@ -718,7 +720,8 @@ void TranslateBubbleView::SwitchView(
|
| SizeToContents();
|
| }
|
|
|
| -void TranslateBubbleView::SwitchToErrorView(TranslateErrors::Type error_type) {
|
| +void TranslateBubbleView::SwitchToErrorView(
|
| + translate::TranslateErrors::Type error_type) {
|
| SwitchView(TranslateBubbleModel::VIEW_STATE_ERROR);
|
| error_type_ = error_type;
|
| model_->ShowError(error_type);
|
|
|