| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 browser::Navigate(¶ms); | 880 browser::Navigate(¶ms); |
| 881 contents = params.target_contents->web_contents(); | 881 contents = params.target_contents->web_contents(); |
| 882 } | 882 } |
| 883 | 883 |
| 884 // TODO(skerner): If we are already in full screen mode, and the user | 884 // TODO(skerner): If we are already in full screen mode, and the user |
| 885 // set the app to open as a regular or pinned tab, what should happen? | 885 // set the app to open as a regular or pinned tab, what should happen? |
| 886 // Today we open the tab, but stay in full screen mode. Should we leave | 886 // Today we open the tab, but stay in full screen mode. Should we leave |
| 887 // full screen mode in this case? | 887 // full screen mode in this case? |
| 888 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && | 888 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && |
| 889 !browser->window()->IsFullscreen()) { | 889 !browser->window()->IsFullscreen()) { |
| 890 browser->ToggleFullscreenMode(false); | 890 browser->ToggleFullscreenMode(); |
| 891 } | 891 } |
| 892 | 892 |
| 893 return contents; | 893 return contents; |
| 894 } | 894 } |
| 895 | 895 |
| 896 // static | 896 // static |
| 897 void Browser::OpenBookmarkManagerWindow(Profile* profile) { | 897 void Browser::OpenBookmarkManagerWindow(Profile* profile) { |
| 898 Browser* browser = Browser::Create(profile); | 898 Browser* browser = Browser::Create(profile); |
| 899 browser->OpenBookmarkManager(); | 899 browser->OpenBookmarkManager(); |
| 900 browser->window()->Show(); | 900 browser->window()->Show(); |
| (...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1830 | 1830 |
| 1831 void Browser::ConvertPopupToTabbedBrowser() { | 1831 void Browser::ConvertPopupToTabbedBrowser() { |
| 1832 content::RecordAction(UserMetricsAction("ShowAsTab")); | 1832 content::RecordAction(UserMetricsAction("ShowAsTab")); |
| 1833 TabContentsWrapper* contents = | 1833 TabContentsWrapper* contents = |
| 1834 tab_handler_->GetTabStripModel()->DetachTabContentsAt(active_index()); | 1834 tab_handler_->GetTabStripModel()->DetachTabContentsAt(active_index()); |
| 1835 Browser* browser = Browser::Create(profile_); | 1835 Browser* browser = Browser::Create(profile_); |
| 1836 browser->tabstrip_model()->AppendTabContents(contents, true); | 1836 browser->tabstrip_model()->AppendTabContents(contents, true); |
| 1837 browser->window()->Show(); | 1837 browser->window()->Show(); |
| 1838 } | 1838 } |
| 1839 | 1839 |
| 1840 // TODO(koz): Change |for_tab| to an enum. | 1840 void Browser::ToggleFullscreenMode() { |
| 1841 void Browser::ToggleFullscreenMode(bool for_tab) { | 1841 fullscreen_controller_->ToggleFullscreenMode(); |
| 1842 fullscreen_controller_->ToggleFullscreenMode(for_tab); | 1842 } |
| 1843 |
| 1844 void Browser::ToggleFullscreenModeWithExtension(const Extension& extension) { |
| 1845 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension); |
| 1843 } | 1846 } |
| 1844 | 1847 |
| 1845 #if defined(OS_MACOSX) | 1848 #if defined(OS_MACOSX) |
| 1846 void Browser::TogglePresentationMode(bool for_tab) { | 1849 void Browser::TogglePresentationMode() { |
| 1847 fullscreen_controller_->TogglePresentationMode(for_tab); | 1850 fullscreen_controller_->TogglePresentationMode(); |
| 1848 } | 1851 } |
| 1849 #endif | 1852 #endif |
| 1850 | 1853 |
| 1851 #if defined(OS_CHROMEOS) | 1854 #if defined(OS_CHROMEOS) |
| 1852 void Browser::Search() { | 1855 void Browser::Search() { |
| 1853 // Exit fullscreen to show omnibox. | 1856 // Exit fullscreen to show omnibox. |
| 1854 if (window_->IsFullscreen()) { | 1857 if (window_->IsFullscreen()) { |
| 1855 ToggleFullscreenMode(false); | 1858 ToggleFullscreenMode(); |
| 1856 // ToggleFullscreenMode is asynchronous, so we don't have omnibox | 1859 // ToggleFullscreenMode is asynchronous, so we don't have omnibox |
| 1857 // visible at this point. Wait for next event cycle which toggles | 1860 // visible at this point. Wait for next event cycle which toggles |
| 1858 // the visibility of omnibox before creating new tab. | 1861 // the visibility of omnibox before creating new tab. |
| 1859 MessageLoop::current()->PostTask( | 1862 MessageLoop::current()->PostTask( |
| 1860 FROM_HERE, base::Bind(&Browser::Search, weak_factory_.GetWeakPtr())); | 1863 FROM_HERE, base::Bind(&Browser::Search, weak_factory_.GetWeakPtr())); |
| 1861 return; | 1864 return; |
| 1862 } | 1865 } |
| 1863 | 1866 |
| 1864 const GURL& url = GetSelectedWebContents()->GetURL(); | 1867 const GURL& url = GetSelectedWebContents()->GetURL(); |
| 1865 if (url.SchemeIs(chrome::kChromeUIScheme) && | 1868 if (url.SchemeIs(chrome::kChromeUIScheme) && |
| (...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2943 case IDC_SELECT_TAB_4: | 2946 case IDC_SELECT_TAB_4: |
| 2944 case IDC_SELECT_TAB_5: | 2947 case IDC_SELECT_TAB_5: |
| 2945 case IDC_SELECT_TAB_6: | 2948 case IDC_SELECT_TAB_6: |
| 2946 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); | 2949 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); |
| 2947 break; | 2950 break; |
| 2948 case IDC_SELECT_LAST_TAB: SelectLastTab(); break; | 2951 case IDC_SELECT_LAST_TAB: SelectLastTab(); break; |
| 2949 case IDC_DUPLICATE_TAB: DuplicateTab(); break; | 2952 case IDC_DUPLICATE_TAB: DuplicateTab(); break; |
| 2950 case IDC_RESTORE_TAB: RestoreTab(); break; | 2953 case IDC_RESTORE_TAB: RestoreTab(); break; |
| 2951 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; | 2954 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; |
| 2952 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; | 2955 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; |
| 2953 case IDC_FULLSCREEN: ToggleFullscreenMode(false); break; | 2956 case IDC_FULLSCREEN: ToggleFullscreenMode(); break; |
| 2954 #if defined(OS_MACOSX) | 2957 #if defined(OS_MACOSX) |
| 2955 case IDC_PRESENTATION_MODE: TogglePresentationMode(false); break; | 2958 case IDC_PRESENTATION_MODE: TogglePresentationMode(); break; |
| 2956 #endif | 2959 #endif |
| 2957 case IDC_EXIT: Exit(); break; | 2960 case IDC_EXIT: Exit(); break; |
| 2958 #if defined(OS_CHROMEOS) | 2961 #if defined(OS_CHROMEOS) |
| 2959 case IDC_SEARCH: Search(); break; | 2962 case IDC_SEARCH: Search(); break; |
| 2960 case IDC_SHOW_KEYBOARD_OVERLAY: ShowKeyboardOverlay(); break; | 2963 case IDC_SHOW_KEYBOARD_OVERLAY: ShowKeyboardOverlay(); break; |
| 2961 #endif | 2964 #endif |
| 2962 | 2965 |
| 2963 // Page-related commands | 2966 // Page-related commands |
| 2964 case IDC_SAVE_PAGE: SavePage(); break; | 2967 case IDC_SAVE_PAGE: SavePage(); break; |
| 2965 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break; | 2968 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break; |
| (...skipping 2589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5555 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; | 5558 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; |
| 5556 ShowSingletonTabOverwritingNTP(params); | 5559 ShowSingletonTabOverwritingNTP(params); |
| 5557 } else { | 5560 } else { |
| 5558 service->ShowLoginDialog(); | 5561 service->ShowLoginDialog(); |
| 5559 } | 5562 } |
| 5560 } | 5563 } |
| 5561 | 5564 |
| 5562 void Browser::ToggleSpeechInput() { | 5565 void Browser::ToggleSpeechInput() { |
| 5563 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); | 5566 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); |
| 5564 } | 5567 } |
| OLD | NEW |