Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

components/translate/core/browser/translate_infobar_delegate.h

 // Copyright 2011 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_DELEGATE_H_
-#define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
+#ifndef COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_
+#define COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "components/translate/core/browser/translate_prefs.h"
@@ skipping 171 matching lines @@
  private:
   friend class TranslationInfoBarTest;
   typedef std::pair<std::string, base::string16> LanguageNamePair;
 
   // Returns a translate infobar that owns |delegate|.
   static scoped_ptr<infobars::InfoBar> CreateInfoBar(
       scoped_ptr<TranslateInfoBarDelegate> delegate);
 
   // Gets the TranslateClient associated with this object.
   // May return NULL if the client has been destroyed.
-  TranslateClient* GetTranslateClient();
+  TranslateClient* GetTranslateClient() const;

[Peter Kasting, 2014/05/21 20:38:24]

Can't return a non-const pointer from a const function.  Both should be const,
or neither.

Why is this actually needed, anyway?  For the test?  It's only used once in
translate_infobar_delegate.cc, and there we don't NULL-check, so we might as
well just access translate_manager_->translate_client() directly.

[droger, 2014/05/22 12:33:37]

Done.

 
   // InfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual infobars::InfoBarDelegate::Type GetInfoBarType() const OVERRIDE;
   virtual bool ShouldExpire(const NavigationDetails& details) const OVERRIDE;
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() OVERRIDE;
 
   bool is_off_the_record_;
   translate::TranslateStep step_;
@@ skipping 10 matching lines @@
 
   // The translation related preferences.
   scoped_ptr<TranslatePrefs> prefs_;
 
   // Whether the translation was triggered via a menu click vs automatically
   // (due to language detection, preferences...)
   bool triggered_from_menu_;
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
+#endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_