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

Side by Side Diff: chrome/browser/ui/browser_commands.cc

Issue 133273029: Move LanguageState to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment + rebase Created 6 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/browser_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 return; 689 return;
690 690
691 WebContents* web_contents = 691 WebContents* web_contents =
692 browser->tab_strip_model()->GetActiveWebContents(); 692 browser->tab_strip_model()->GetActiveWebContents();
693 TranslateTabHelper* translate_tab_helper = 693 TranslateTabHelper* translate_tab_helper =
694 TranslateTabHelper::FromWebContents(web_contents); 694 TranslateTabHelper::FromWebContents(web_contents);
695 695
696 TranslateBubbleModel::ViewState view_state = 696 TranslateBubbleModel::ViewState view_state =
697 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE; 697 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE;
698 if (translate_tab_helper) { 698 if (translate_tab_helper) {
699 if (translate_tab_helper->language_state().translation_pending()) 699 if (translate_tab_helper->GetLanguageState().translation_pending())
700 view_state = TranslateBubbleModel::VIEW_STATE_TRANSLATING; 700 view_state = TranslateBubbleModel::VIEW_STATE_TRANSLATING;
701 else if (translate_tab_helper->language_state().IsPageTranslated()) 701 else if (translate_tab_helper->GetLanguageState().IsPageTranslated())
702 view_state = TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE; 702 view_state = TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE;
703 } 703 }
704 browser->window()->ShowTranslateBubble(web_contents, view_state, 704 browser->window()->ShowTranslateBubble(web_contents, view_state,
705 TranslateErrors::NONE); 705 TranslateErrors::NONE);
706 } 706 }
707 707
708 void TogglePagePinnedToStartScreen(Browser* browser) { 708 void TogglePagePinnedToStartScreen(Browser* browser) {
709 #if defined(OS_WIN) 709 #if defined(OS_WIN)
710 MetroPinTabHelper::FromWebContents( 710 MetroPinTabHelper::FromWebContents(
711 browser->tab_strip_model()->GetActiveWebContents())-> 711 browser->tab_strip_model()->GetActiveWebContents())->
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), 1164 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
1165 browser->host_desktop_type())); 1165 browser->host_desktop_type()));
1166 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1166 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1167 1167
1168 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1168 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1169 contents->GetRenderViewHost()->SyncRendererPrefs(); 1169 contents->GetRenderViewHost()->SyncRendererPrefs();
1170 app_browser->window()->Show(); 1170 app_browser->window()->Show();
1171 } 1171 }
1172 1172
1173 } // namespace chrome 1173 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_content_translate_driver_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698