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 <stddef.h> | 7 #include <stddef.h> |
8 | |
9 #include <algorithm> | 8 #include <algorithm> |
10 #include <string> | 9 #include <string> |
| 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/i18n/string_compare.h" | 13 #include "base/i18n/string_compare.h" |
14 #include "base/memory/singleton.h" | 14 #include "base/memory/singleton.h" |
15 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
16 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/translate/chrome_translate_client.h" | 20 #include "chrome/browser/translate/chrome_translate_client.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 ChromeTranslateClient::GetTranslateLanguages( | 109 ChromeTranslateClient::GetTranslateLanguages( |
110 web_contents, &source_language, &target_language); | 110 web_contents, &source_language, &target_language); |
111 | 111 |
112 scoped_ptr<translate::TranslateUIDelegate> ui_delegate( | 112 scoped_ptr<translate::TranslateUIDelegate> ui_delegate( |
113 new translate::TranslateUIDelegate( | 113 new translate::TranslateUIDelegate( |
114 ChromeTranslateClient::GetManagerFromWebContents(web_contents) | 114 ChromeTranslateClient::GetManagerFromWebContents(web_contents) |
115 ->GetWeakPtr(), | 115 ->GetWeakPtr(), |
116 source_language, | 116 source_language, |
117 target_language)); | 117 target_language)); |
118 scoped_ptr<TranslateBubbleModel> model( | 118 scoped_ptr<TranslateBubbleModel> model( |
119 new TranslateBubbleModelImpl(step, ui_delegate.Pass())); | 119 new TranslateBubbleModelImpl(step, std::move(ui_delegate))); |
120 TranslateBubbleView* view = new TranslateBubbleView(anchor_view, | 120 TranslateBubbleView* view = new TranslateBubbleView( |
121 model.Pass(), | 121 anchor_view, std::move(model), error_type, web_contents); |
122 error_type, | |
123 web_contents); | |
124 views::BubbleDelegateView::CreateBubble(view); | 122 views::BubbleDelegateView::CreateBubble(view); |
125 view->ShowForReason(reason); | 123 view->ShowForReason(reason); |
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(); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 translating_view_(NULL), | 251 translating_view_(NULL), |
254 after_translate_view_(NULL), | 252 after_translate_view_(NULL), |
255 error_view_(NULL), | 253 error_view_(NULL), |
256 advanced_view_(NULL), | 254 advanced_view_(NULL), |
257 denial_combobox_(NULL), | 255 denial_combobox_(NULL), |
258 source_language_combobox_(NULL), | 256 source_language_combobox_(NULL), |
259 target_language_combobox_(NULL), | 257 target_language_combobox_(NULL), |
260 always_translate_checkbox_(NULL), | 258 always_translate_checkbox_(NULL), |
261 advanced_cancel_button_(NULL), | 259 advanced_cancel_button_(NULL), |
262 advanced_done_button_(NULL), | 260 advanced_done_button_(NULL), |
263 model_(model.Pass()), | 261 model_(std::move(model)), |
264 error_type_(error_type), | 262 error_type_(error_type), |
265 is_in_incognito_window_( | 263 is_in_incognito_window_( |
266 web_contents ? web_contents->GetBrowserContext()->IsOffTheRecord() | 264 web_contents ? web_contents->GetBrowserContext()->IsOffTheRecord() |
267 : false), | 265 : false), |
268 translate_executed_(false), | 266 translate_executed_(false), |
269 denial_button_clicked_(false) { | 267 denial_button_clicked_(false) { |
270 if (model_->GetViewState() != | 268 if (model_->GetViewState() != |
271 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) { | 269 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) { |
272 translate_executed_ = true; | 270 translate_executed_ = true; |
273 } | 271 } |
(...skipping 482 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 |