Revert 50913...

chrome/browser/translate/translate_infobar_delegate2.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
       Type infobar_type,
       TranslateErrors::Type error,
       TabContents* tab_contents,
       const std::string& original_language,
       const std::string& target_language);
 
   // Returns the number of languages supported.
   int GetLanguageCount() const;
 
   // Returns the ISO code for the language at |index|.
-  std::string GetLanguageCodeAt(int index) const;
+  const std::string& GetLanguageCodeAt(int index) const;
 
   // Returns the displayable name for the language at |index|.
-  string16 GetLanguageDisplayableNameAt(int index) const;
+  const string16& GetLanguageDisplayableNameAt(int index) const;
 
   TabContents* tab_contents() const { return tab_contents_; }
 
   Type type() const { return type_; }
 
   int original_language_index() const { return original_language_index_; }
   int target_language_index() const { return target_language_index_; }
 
   // Convenience methods.
-  std::string GetOriginalLanguageCode() const;
-  std::string GetTargetLanguageCode() const;
+  const std::string& GetOriginalLanguageCode() const;
+  const std::string& GetTargetLanguageCode() const;
 
   // Called by the InfoBar to notify that the original/target language has
   // changed and is now the language at |language_index|.
   virtual void SetOriginalLanguage(int language_index);
   virtual void SetTargetLanguage(int language_index);
 
   // Returns true if the current infobar indicates an error (in which case it
   // should get a yellow background instead of a blue one).
   bool IsError();
 
   // Returns what kind of background fading effect the infobar should use when
   // its is shown.
   BackgroundAnimationType background_animation_type() const {
     return background_animation_;
   }
 
   virtual void Translate();
   virtual void RevertTranslation();
 
   // Called when the user declines to translate a page, by either closing the
   // infobar or pressing the "Don't translate" button.
   void TranslationDeclined();
 
   // InfoBarDelegate implementation:
   virtual InfoBar* CreateInfoBar();
-  virtual void InfoBarDismissed();
-  virtual void InfoBarClosed();
+  void InfoBarDismissed();
   virtual SkBitmap* GetIcon() const;
   virtual InfoBarDelegate::Type GetInfoBarType();
   virtual TranslateInfoBarDelegate2* AsTranslateInfoBarDelegate2() {
     return this;
   }
 
   // Methods called by the Options menu delegate.
   virtual bool IsLanguageBlacklisted();
   virtual void ToggleLanguageBlacklist();
   virtual bool IsSiteBlacklisted();
@@ skipping 67 matching lines @@
   TranslateInfoBarView* infobar_view_;
 
   // The translation related preferences.
   TranslatePrefs prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate2);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_