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

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

Issue 87503004: Pass the Translate error type to the bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (rebasing) Created 7 years 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 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 TranslateTabHelper::FromWebContents(web_contents); 693 TranslateTabHelper::FromWebContents(web_contents);
694 694
695 TranslateBubbleModel::ViewState view_state = 695 TranslateBubbleModel::ViewState view_state =
696 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE; 696 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE;
697 if (translate_tab_helper) { 697 if (translate_tab_helper) {
698 if (translate_tab_helper->language_state().translation_pending()) 698 if (translate_tab_helper->language_state().translation_pending())
699 view_state = TranslateBubbleModel::VIEW_STATE_TRANSLATING; 699 view_state = TranslateBubbleModel::VIEW_STATE_TRANSLATING;
700 else if (translate_tab_helper->language_state().IsPageTranslated()) 700 else if (translate_tab_helper->language_state().IsPageTranslated())
701 view_state = TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE; 701 view_state = TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE;
702 } 702 }
703 browser->window()->ShowTranslateBubble(web_contents, view_state); 703 browser->window()->ShowTranslateBubble(web_contents, view_state,
704 TranslateErrors::NONE);
704 } 705 }
705 706
706 void TogglePagePinnedToStartScreen(Browser* browser) { 707 void TogglePagePinnedToStartScreen(Browser* browser) {
707 #if defined(OS_WIN) 708 #if defined(OS_WIN)
708 MetroPinTabHelper::FromWebContents( 709 MetroPinTabHelper::FromWebContents(
709 browser->tab_strip_model()->GetActiveWebContents())-> 710 browser->tab_strip_model()->GetActiveWebContents())->
710 TogglePinnedToStartScreen(); 711 TogglePinnedToStartScreen();
711 #endif 712 #endif
712 } 713 }
713 714
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), 1162 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
1162 browser->host_desktop_type())); 1163 browser->host_desktop_type()));
1163 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1164 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1164 1165
1165 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1166 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1166 contents->GetRenderViewHost()->SyncRendererPrefs(); 1167 contents->GetRenderViewHost()->SyncRendererPrefs();
1167 app_browser->window()->Show(); 1168 app_browser->window()->Show();
1168 } 1169 }
1169 1170
1170 } // namespace chrome 1171 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698