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

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

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: view id on tests Created 7 years, 1 month 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 12 matching lines...) Expand all
23 #include "chrome/browser/google/google_util.h" 23 #include "chrome/browser/google/google_util.h"
24 #include "chrome/browser/lifetime/application_lifetime.h" 24 #include "chrome/browser/lifetime/application_lifetime.h"
25 #include "chrome/browser/platform_util.h" 25 #include "chrome/browser/platform_util.h"
26 #include "chrome/browser/prefs/incognito_mode_prefs.h" 26 #include "chrome/browser/prefs/incognito_mode_prefs.h"
27 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/rlz/rlz.h" 28 #include "chrome/browser/rlz/rlz.h"
29 #include "chrome/browser/sessions/session_service_factory.h" 29 #include "chrome/browser/sessions/session_service_factory.h"
30 #include "chrome/browser/sessions/tab_restore_service.h" 30 #include "chrome/browser/sessions/tab_restore_service.h"
31 #include "chrome/browser/sessions/tab_restore_service_delegate.h" 31 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
32 #include "chrome/browser/sessions/tab_restore_service_factory.h" 32 #include "chrome/browser/sessions/tab_restore_service_factory.h"
33 #include "chrome/browser/translate/translate_tab_helper.h"
33 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" 34 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
34 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 35 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
35 #include "chrome/browser/ui/browser.h" 36 #include "chrome/browser/ui/browser.h"
36 #include "chrome/browser/ui/browser_command_controller.h" 37 #include "chrome/browser/ui/browser_command_controller.h"
37 #include "chrome/browser/ui/browser_dialogs.h" 38 #include "chrome/browser/ui/browser_dialogs.h"
38 #include "chrome/browser/ui/browser_finder.h" 39 #include "chrome/browser/ui/browser_finder.h"
39 #include "chrome/browser/ui/browser_instant_controller.h" 40 #include "chrome/browser/ui/browser_instant_controller.h"
40 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" 41 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
41 #include "chrome/browser/ui/browser_tabstrip.h" 42 #include "chrome/browser/ui/browser_tabstrip.h"
42 #include "chrome/browser/ui/browser_window.h" 43 #include "chrome/browser/ui/browser_window.h"
43 #include "chrome/browser/ui/chrome_pages.h" 44 #include "chrome/browser/ui/chrome_pages.h"
44 #include "chrome/browser/ui/find_bar/find_bar.h" 45 #include "chrome/browser/ui/find_bar/find_bar.h"
45 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 46 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
46 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 47 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
47 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 48 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
48 #include "chrome/browser/ui/omnibox/location_bar.h" 49 #include "chrome/browser/ui/omnibox/location_bar.h"
49 #include "chrome/browser/ui/status_bubble.h" 50 #include "chrome/browser/ui/status_bubble.h"
50 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 51 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
51 #include "chrome/browser/ui/tabs/tab_strip_model.h" 52 #include "chrome/browser/ui/tabs/tab_strip_model.h"
53 #include "chrome/browser/ui/translate/translate_bubble_model.h"
52 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 54 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
53 #include "chrome/browser/upgrade_detector.h" 55 #include "chrome/browser/upgrade_detector.h"
54 #include "chrome/browser/web_applications/web_app.h" 56 #include "chrome/browser/web_applications/web_app.h"
55 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/chrome_version_info.h" 58 #include "chrome/common/chrome_version_info.h"
57 #include "chrome/common/content_restriction.h" 59 #include "chrome/common/content_restriction.h"
58 #include "chrome/common/pref_names.h" 60 #include "chrome/common/pref_names.h"
59 #include "components/web_modal/web_contents_modal_dialog_manager.h" 61 #include "components/web_modal/web_contents_modal_dialog_manager.h"
60 #include "content/public/browser/devtools_agent_host.h" 62 #include "content/public/browser/devtools_agent_host.h"
61 #include "content/public/browser/navigation_controller.h" 63 #include "content/public/browser/navigation_controller.h"
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 674
673 void BookmarkAllTabs(Browser* browser) { 675 void BookmarkAllTabs(Browser* browser) {
674 chrome::ShowBookmarkAllTabsDialog(browser); 676 chrome::ShowBookmarkAllTabsDialog(browser);
675 } 677 }
676 678
677 bool CanBookmarkAllTabs(const Browser* browser) { 679 bool CanBookmarkAllTabs(const Browser* browser) {
678 return browser->tab_strip_model()->count() > 1 && 680 return browser->tab_strip_model()->count() > 1 &&
679 CanBookmarkCurrentPage(browser); 681 CanBookmarkCurrentPage(browser);
680 } 682 }
681 683
684 void Translate(Browser* browser) {
685 if (!browser->window()->IsActive())
686 return;
687
688 WebContents* web_contents =
689 browser->tab_strip_model()->GetActiveWebContents();
690 TranslateTabHelper* translate_tab_helper =
691 TranslateTabHelper::FromWebContents(web_contents);
692
693 TranslateBubbleModel::ViewState view_state =
694 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE;
695 if (translate_tab_helper) {
696 if (translate_tab_helper->language_state().translation_pending())
697 view_state = TranslateBubbleModel::VIEW_STATE_TRANSLATING;
698 else if (translate_tab_helper->language_state().IsPageTranslated())
699 view_state = TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE;
700 }
701 browser->window()->ShowTranslateBubble(web_contents, view_state);
702 }
703
682 void TogglePagePinnedToStartScreen(Browser* browser) { 704 void TogglePagePinnedToStartScreen(Browser* browser) {
683 #if defined(OS_WIN) 705 #if defined(OS_WIN)
684 MetroPinTabHelper::FromWebContents( 706 MetroPinTabHelper::FromWebContents(
685 browser->tab_strip_model()->GetActiveWebContents())-> 707 browser->tab_strip_model()->GetActiveWebContents())->
686 TogglePinnedToStartScreen(); 708 TogglePinnedToStartScreen();
687 #endif 709 #endif
688 } 710 }
689 711
690 void SavePage(Browser* browser) { 712 void SavePage(Browser* browser) {
691 content::RecordAction(UserMetricsAction("SavePage")); 713 content::RecordAction(UserMetricsAction("SavePage"));
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), 1147 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
1126 browser->host_desktop_type())); 1148 browser->host_desktop_type()));
1127 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1149 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1128 1150
1129 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1151 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1130 contents->GetRenderViewHost()->SyncRendererPrefs(); 1152 contents->GetRenderViewHost()->SyncRendererPrefs();
1131 app_browser->window()->Show(); 1153 app_browser->window()->Show();
1132 } 1154 }
1133 1155
1134 } // namespace chrome 1156 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.h ('k') | chrome/browser/ui/browser_language_state_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698