OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/translate/translate_bubble_view.h" | 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 ChromeTranslateClient::GetManagerFromWebContents(web_contents) | 112 ChromeTranslateClient::GetManagerFromWebContents(web_contents) |
113 ->GetWeakPtr(), | 113 ->GetWeakPtr(), |
114 source_language, | 114 source_language, |
115 target_language)); | 115 target_language)); |
116 scoped_ptr<TranslateBubbleModel> model( | 116 scoped_ptr<TranslateBubbleModel> model( |
117 new TranslateBubbleModelImpl(step, ui_delegate.Pass())); | 117 new TranslateBubbleModelImpl(step, ui_delegate.Pass())); |
118 TranslateBubbleView* view = new TranslateBubbleView(anchor_view, | 118 TranslateBubbleView* view = new TranslateBubbleView(anchor_view, |
119 model.Pass(), | 119 model.Pass(), |
120 error_type, | 120 error_type, |
121 web_contents); | 121 web_contents); |
122 if (is_user_gesture) | 122 views::BubbleDelegateView::CreateBubble(view); |
123 views::BubbleDelegateView::CreateBubble(view)->Show(); | 123 view->ShowForReason(is_user_gesture ? USER_ACTION : AUTOMATIC); |
124 else | |
125 views::BubbleDelegateView::CreateBubble(view)->ShowInactive(); | |
126 } | 124 } |
127 | 125 |
128 // static | 126 // static |
129 void TranslateBubbleView::CloseBubble() { | 127 void TranslateBubbleView::CloseBubble() { |
130 if (!translate_bubble_view_) | 128 if (!translate_bubble_view_) |
131 return; | 129 return; |
132 | 130 |
133 translate_bubble_view_->GetWidget()->Close(); | 131 translate_bubble_view_->GetWidget()->Close(); |
134 } | 132 } |
135 | 133 |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
756 base::string16 label; | 754 base::string16 label; |
757 if (model_->IsPageTranslatedInCurrentLanguages()) | 755 if (model_->IsPageTranslatedInCurrentLanguages()) |
758 label = l10n_util::GetStringUTF16(IDS_DONE); | 756 label = l10n_util::GetStringUTF16(IDS_DONE); |
759 else | 757 else |
760 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT); | 758 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT); |
761 advanced_done_button_->SetText(label); | 759 advanced_done_button_->SetText(label); |
762 advanced_done_button_->SizeToPreferredSize(); | 760 advanced_done_button_->SizeToPreferredSize(); |
763 if (advanced_view_) | 761 if (advanced_view_) |
764 advanced_view_->Layout(); | 762 advanced_view_->Layout(); |
765 } | 763 } |
OLD | NEW |