Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: chrome/browser/translate/translate_infobar_delegate2.cc

Issue 2878005: TranslateInfoBarDelegate2 were leaked. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/translate/translate_infobar_delegate2.h"
6
5 #include <algorithm> 7 #include <algorithm>
6 8
7 #include "chrome/browser/translate/translate_infobar_delegate2.h"
8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/profile.h" 12 #include "chrome/browser/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 13 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/translate/translate_infobar_view.h" 14 #include "chrome/browser/translate/translate_infobar_view.h"
15 #include "chrome/browser/translate/translate_manager2.h" 15 #include "chrome/browser/translate/translate_manager2.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 18
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 76 }
77 77
78 DCHECK(original_language_index_ != -1); 78 DCHECK(original_language_index_ != -1);
79 DCHECK(target_language_index_ != -1); 79 DCHECK(target_language_index_ != -1);
80 } 80 }
81 81
82 int TranslateInfoBarDelegate2::GetLanguageCount() const { 82 int TranslateInfoBarDelegate2::GetLanguageCount() const {
83 return static_cast<int>(languages_.size()); 83 return static_cast<int>(languages_.size());
84 } 84 }
85 85
86 const std::string& TranslateInfoBarDelegate2::GetLanguageCodeAt( 86 std::string TranslateInfoBarDelegate2::GetLanguageCodeAt(
87 int index) const { 87 int index) const {
88 DCHECK(index >=0 && index < GetLanguageCount()); 88 DCHECK(index >=0 && index < GetLanguageCount());
89 return languages_[index].first; 89 return languages_[index].first;
90 } 90 }
91 91
92 const string16& TranslateInfoBarDelegate2::GetLanguageDisplayableNameAt( 92 string16 TranslateInfoBarDelegate2::GetLanguageDisplayableNameAt(
93 int index) const { 93 int index) const {
94 DCHECK(index >=0 && index < GetLanguageCount()); 94 DCHECK(index >=0 && index < GetLanguageCount());
95 return languages_[index].second; 95 return languages_[index].second;
96 } 96 }
97 97
98 const std::string& TranslateInfoBarDelegate2::GetOriginalLanguageCode() const { 98 std::string TranslateInfoBarDelegate2::GetOriginalLanguageCode() const {
99 return GetLanguageCodeAt(original_language_index()); 99 return GetLanguageCodeAt(original_language_index());
100 } 100 }
101 101
102 const std::string& TranslateInfoBarDelegate2::GetTargetLanguageCode() const { 102 std::string TranslateInfoBarDelegate2::GetTargetLanguageCode() const {
103 return GetLanguageCodeAt(target_language_index()); 103 return GetLanguageCodeAt(target_language_index());
104 } 104 }
105 105
106 void TranslateInfoBarDelegate2::SetOriginalLanguage(int language_index) { 106 void TranslateInfoBarDelegate2::SetOriginalLanguage(int language_index) {
107 DCHECK(language_index < static_cast<int>(languages_.size())); 107 DCHECK(language_index < static_cast<int>(languages_.size()));
108 original_language_index_ = language_index; 108 original_language_index_ = language_index;
109 if (infobar_view_) 109 if (infobar_view_)
110 infobar_view_->OriginalLanguageChanged(); 110 infobar_view_->OriginalLanguageChanged();
111 if (type_ == AFTER_TRANSLATE) 111 if (type_ == AFTER_TRANSLATE)
112 Translate(); 112 Translate();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 void TranslateInfoBarDelegate2::InfoBarDismissed() { 149 void TranslateInfoBarDelegate2::InfoBarDismissed() {
150 if (type_ != BEFORE_TRANSLATE) 150 if (type_ != BEFORE_TRANSLATE)
151 return; 151 return;
152 152
153 // The user closed the infobar without clicking the translate button. 153 // The user closed the infobar without clicking the translate button.
154 TranslationDeclined(); 154 TranslationDeclined();
155 UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslateCloseInfobar", 1); 155 UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslateCloseInfobar", 1);
156 } 156 }
157 157
158 void TranslateInfoBarDelegate2::InfoBarClosed() {
159 delete this;
160 }
161
158 SkBitmap* TranslateInfoBarDelegate2::GetIcon() const { 162 SkBitmap* TranslateInfoBarDelegate2::GetIcon() const {
159 return ResourceBundle::GetSharedInstance().GetBitmapNamed( 163 return ResourceBundle::GetSharedInstance().GetBitmapNamed(
160 IDR_INFOBAR_TRANSLATE); 164 IDR_INFOBAR_TRANSLATE);
161 } 165 }
162 166
163 InfoBarDelegate::Type TranslateInfoBarDelegate2::GetInfoBarType() { 167 InfoBarDelegate::Type TranslateInfoBarDelegate2::GetInfoBarType() {
164 return InfoBarDelegate::PAGE_ACTION_TYPE; 168 return InfoBarDelegate::PAGE_ACTION_TYPE;
165 } 169 }
166 170
167 bool TranslateInfoBarDelegate2::IsLanguageBlacklisted() { 171 bool TranslateInfoBarDelegate2::IsLanguageBlacklisted() {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 std::swap(offsets[0], offsets[1]); 300 std::swap(offsets[0], offsets[1]);
297 *swap_languages = true; 301 *swap_languages = true;
298 } else { 302 } else {
299 *swap_languages = false; 303 *swap_languages = false;
300 } 304 }
301 305
302 strings->push_back(text.substr(0, offsets[0])); 306 strings->push_back(text.substr(0, offsets[0]));
303 strings->push_back(text.substr(offsets[0], offsets[1])); 307 strings->push_back(text.substr(offsets[0], offsets[1]));
304 strings->push_back(text.substr(offsets[1])); 308 strings->push_back(text.substr(offsets[1]));
305 } 309 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate2.h ('k') | chrome/browser/translate/translate_manager2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698