Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index 799f03cceb2eb21a405d876e139a27fe86ebb60c..860f39cce06c3406c4a41161aef28903e7b4905a 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -85,6 +85,7 @@ |
| #include "chrome/browser/tab_contents/tab_util.h" |
| #include "chrome/browser/themes/theme_service.h" |
| #include "chrome/browser/themes/theme_service_factory.h" |
| +#include "chrome/browser/translate/translate_tab_helper.h" |
| #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" |
| #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h" |
| #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| @@ -96,6 +97,7 @@ |
| #include "chrome/browser/ui/browser_finder.h" |
| #include "chrome/browser/ui/browser_instant_controller.h" |
| #include "chrome/browser/ui/browser_iterator.h" |
| +#include "chrome/browser/ui/browser_language_state_observer.h" |
| #include "chrome/browser/ui/browser_list.h" |
| #include "chrome/browser/ui/browser_navigator.h" |
| #include "chrome/browser/ui/browser_tab_contents.h" |
| @@ -344,7 +346,8 @@ Browser::Browser(const CreateParams& params) |
| this, g_browser_process->profile_manager())), |
| window_has_shown_(false), |
| chrome_updater_factory_(this), |
| - weak_factory_(this) { |
| + weak_factory_(this), |
| + language_state_observer_(new BrowserLanguageStateObserver(this)) { |
| // If this causes a crash then a window is being opened using a profile type |
| // that is disallowed by policy. The crash prevents the disabled window type |
| // from opening at all, but the path that triggered it should be fixed. |
| @@ -1759,6 +1762,11 @@ void Browser::OnZoomChanged(content::WebContents* source, |
| } |
| } |
| +/*void Browser::OnTranslateEnabledChanged(content::WebContents* source) { |
|
sky
2013/10/22 16:09:22
?
hajimehoshi
2013/10/23 10:45:09
Sorry, done.
|
| + if (source == tab_strip_model_->GetActiveWebContents()) |
| + window_->UpdateToolbar(source); |
| + }*/ |
| + |
| /////////////////////////////////////////////////////////////////////////////// |
| // Browser, ui::SelectFileDialog::Listener implementation: |
| @@ -2087,6 +2095,10 @@ void Browser::SetAsDelegate(WebContents* web_contents, Browser* delegate) { |
| CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate); |
| ZoomController::FromWebContents(web_contents)->set_observer(delegate); |
| + TranslateTabHelper* translate_tab_helper = |
| + TranslateTabHelper::FromWebContents(web_contents); |
| + translate_tab_helper->language_state().set_observer( |
| + delegate->language_state_observer_.get()); |
| } |
| void Browser::CloseFrame() { |