| 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 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 799 browser::Navigate(¶ms); | 799 browser::Navigate(¶ms); |
| 800 contents = params.target_contents->web_contents(); | 800 contents = params.target_contents->web_contents(); |
| 801 } | 801 } |
| 802 | 802 |
| 803 // TODO(skerner): If we are already in full screen mode, and the user | 803 // TODO(skerner): If we are already in full screen mode, and the user |
| 804 // set the app to open as a regular or pinned tab, what should happen? | 804 // set the app to open as a regular or pinned tab, what should happen? |
| 805 // Today we open the tab, but stay in full screen mode. Should we leave | 805 // Today we open the tab, but stay in full screen mode. Should we leave |
| 806 // full screen mode in this case? | 806 // full screen mode in this case? |
| 807 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && | 807 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && |
| 808 !browser->window()->IsFullscreen()) { | 808 !browser->window()->IsFullscreen()) { |
| 809 browser->ToggleFullscreenMode(false); | 809 browser->ToggleFullscreenMode(); |
| 810 } | 810 } |
| 811 | 811 |
| 812 return contents; | 812 return contents; |
| 813 } | 813 } |
| 814 | 814 |
| 815 // static | 815 // static |
| 816 void Browser::OpenBookmarkManagerWindow(Profile* profile) { | 816 void Browser::OpenBookmarkManagerWindow(Profile* profile) { |
| 817 Browser* browser = Browser::Create(profile); | 817 Browser* browser = Browser::Create(profile); |
| 818 browser->OpenBookmarkManager(); | 818 browser->OpenBookmarkManager(); |
| 819 browser->window()->Show(); | 819 browser->window()->Show(); |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1751 | 1751 |
| 1752 void Browser::ConvertPopupToTabbedBrowser() { | 1752 void Browser::ConvertPopupToTabbedBrowser() { |
| 1753 content::RecordAction(UserMetricsAction("ShowAsTab")); | 1753 content::RecordAction(UserMetricsAction("ShowAsTab")); |
| 1754 TabContentsWrapper* contents = | 1754 TabContentsWrapper* contents = |
| 1755 tab_handler_->GetTabStripModel()->DetachTabContentsAt(active_index()); | 1755 tab_handler_->GetTabStripModel()->DetachTabContentsAt(active_index()); |
| 1756 Browser* browser = Browser::Create(profile_); | 1756 Browser* browser = Browser::Create(profile_); |
| 1757 browser->tabstrip_model()->AppendTabContents(contents, true); | 1757 browser->tabstrip_model()->AppendTabContents(contents, true); |
| 1758 browser->window()->Show(); | 1758 browser->window()->Show(); |
| 1759 } | 1759 } |
| 1760 | 1760 |
| 1761 // TODO(koz): Change |for_tab| to an enum. | 1761 void Browser::ToggleFullscreenMode() { |
| 1762 void Browser::ToggleFullscreenMode(bool for_tab) { | 1762 fullscreen_controller_->ToggleFullscreenMode(); |
| 1763 fullscreen_controller_->ToggleFullscreenMode(for_tab); | 1763 } |
| 1764 |
| 1765 void Browser::ToggleFullscreenModeWithExtension(const Extension& extension) { |
| 1766 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension); |
| 1764 } | 1767 } |
| 1765 | 1768 |
| 1766 #if defined(OS_MACOSX) | 1769 #if defined(OS_MACOSX) |
| 1767 void Browser::TogglePresentationMode(bool for_tab) { | 1770 void Browser::TogglePresentationMode() { |
| 1768 fullscreen_controller_->TogglePresentationMode(for_tab); | 1771 fullscreen_controller_->TogglePresentationMode(); |
| 1769 } | 1772 } |
| 1770 #endif | 1773 #endif |
| 1771 | 1774 |
| 1772 #if defined(OS_CHROMEOS) | 1775 #if defined(OS_CHROMEOS) |
| 1773 void Browser::Search() { | 1776 void Browser::Search() { |
| 1774 // Exit fullscreen to show omnibox. | 1777 // Exit fullscreen to show omnibox. |
| 1775 if (window_->IsFullscreen()) { | 1778 if (window_->IsFullscreen()) { |
| 1776 ToggleFullscreenMode(false); | 1779 ToggleFullscreenMode(); |
| 1777 // ToggleFullscreenMode is asynchronous, so we don't have omnibox | 1780 // ToggleFullscreenMode is asynchronous, so we don't have omnibox |
| 1778 // visible at this point. Wait for next event cycle which toggles | 1781 // visible at this point. Wait for next event cycle which toggles |
| 1779 // the visibility of omnibox before creating new tab. | 1782 // the visibility of omnibox before creating new tab. |
| 1780 MessageLoop::current()->PostTask( | 1783 MessageLoop::current()->PostTask( |
| 1781 FROM_HERE, base::Bind(&Browser::Search, weak_factory_.GetWeakPtr())); | 1784 FROM_HERE, base::Bind(&Browser::Search, weak_factory_.GetWeakPtr())); |
| 1782 return; | 1785 return; |
| 1783 } | 1786 } |
| 1784 | 1787 |
| 1785 const GURL& url = GetSelectedWebContents()->GetURL(); | 1788 const GURL& url = GetSelectedWebContents()->GetURL(); |
| 1786 if (url.SchemeIs(chrome::kChromeUIScheme) && | 1789 if (url.SchemeIs(chrome::kChromeUIScheme) && |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2859 case IDC_SELECT_TAB_4: | 2862 case IDC_SELECT_TAB_4: |
| 2860 case IDC_SELECT_TAB_5: | 2863 case IDC_SELECT_TAB_5: |
| 2861 case IDC_SELECT_TAB_6: | 2864 case IDC_SELECT_TAB_6: |
| 2862 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); | 2865 case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); |
| 2863 break; | 2866 break; |
| 2864 case IDC_SELECT_LAST_TAB: SelectLastTab(); break; | 2867 case IDC_SELECT_LAST_TAB: SelectLastTab(); break; |
| 2865 case IDC_DUPLICATE_TAB: DuplicateTab(); break; | 2868 case IDC_DUPLICATE_TAB: DuplicateTab(); break; |
| 2866 case IDC_RESTORE_TAB: RestoreTab(); break; | 2869 case IDC_RESTORE_TAB: RestoreTab(); break; |
| 2867 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; | 2870 case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; |
| 2868 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; | 2871 case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; |
| 2869 case IDC_FULLSCREEN: ToggleFullscreenMode(false); break; | 2872 case IDC_FULLSCREEN: ToggleFullscreenMode(); break; |
| 2870 #if defined(OS_MACOSX) | 2873 #if defined(OS_MACOSX) |
| 2871 case IDC_PRESENTATION_MODE: TogglePresentationMode(false); break; | 2874 case IDC_PRESENTATION_MODE: TogglePresentationMode(); break; |
| 2872 #endif | 2875 #endif |
| 2873 case IDC_EXIT: Exit(); break; | 2876 case IDC_EXIT: Exit(); break; |
| 2874 #if defined(OS_CHROMEOS) | 2877 #if defined(OS_CHROMEOS) |
| 2875 case IDC_SEARCH: Search(); break; | 2878 case IDC_SEARCH: Search(); break; |
| 2876 case IDC_SHOW_KEYBOARD_OVERLAY: ShowKeyboardOverlay(); break; | 2879 case IDC_SHOW_KEYBOARD_OVERLAY: ShowKeyboardOverlay(); break; |
| 2877 #endif | 2880 #endif |
| 2878 | 2881 |
| 2879 // Page-related commands | 2882 // Page-related commands |
| 2880 case IDC_SAVE_PAGE: SavePage(); break; | 2883 case IDC_SAVE_PAGE: SavePage(); break; |
| 2881 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break; | 2884 case IDC_BOOKMARK_PAGE: BookmarkCurrentPage(); break; |
| (...skipping 2614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5496 profile()->GetOriginalProfile()); | 5499 profile()->GetOriginalProfile()); |
| 5497 if (service->HasSyncSetupCompleted()) | 5500 if (service->HasSyncSetupCompleted()) |
| 5498 ShowOptionsTab(chrome::kPersonalOptionsSubPage); | 5501 ShowOptionsTab(chrome::kPersonalOptionsSubPage); |
| 5499 else | 5502 else |
| 5500 service->ShowLoginDialog(); | 5503 service->ShowLoginDialog(); |
| 5501 } | 5504 } |
| 5502 | 5505 |
| 5503 void Browser::ToggleSpeechInput() { | 5506 void Browser::ToggleSpeechInput() { |
| 5504 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); | 5507 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); |
| 5505 } | 5508 } |
| OLD | NEW |