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

Unified Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10414064: Handle more browser commands in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build of ShellDelegateImpl Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index dba8dc88818e6944632722a14881e2814b6a2a70..fb0c0a48930dff52d8fe3d714b86e03321f1f812 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -13,6 +13,8 @@
#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sessions/tab_restore_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
@@ -115,6 +117,13 @@ void ChromeShellDelegate::Exit() {
browser::AttemptUserExit();
}
+void ChromeShellDelegate::NewTab() {
+ Browser* browser = browser::FindOrCreateTabbedBrowser(
+ ProfileManager::GetDefaultProfileOrOffTheRecord());
+ browser->NewTab();
+ browser->window()->Show();
+}
+
void ChromeShellDelegate::NewWindow(bool is_incognito) {
Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
Browser::NewEmptyWindow(
@@ -194,12 +203,39 @@ void ChromeShellDelegate::OpenMobileSetup() {
#endif
}
+void ChromeShellDelegate::RestoreTab() {
+ Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
+ TabRestoreService* service =
+ TabRestoreServiceFactory::GetForProfile(profile);
+ if (!service)
+ return;
+ if (service->IsLoaded()) {
+ Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
+ browser->RestoreTab();
+ } else {
+ service->LoadTabsFromLastSession();
+ // LoadTabsFromLastSession is asynchronous, so TabRestoreService has not
+ // finished loading the entries at this point. Wait for next event cycle
+ // which loads the restored tab entries.
+ MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&ChromeShellDelegate::RestoreTab,
+ weak_factory_.GetWeakPtr()));
+ }
+}
+
void ChromeShellDelegate::ShowKeyboardOverlay() {
#if defined(OS_CHROMEOS)
KeyboardOverlayDialogView::ShowDialog();
#endif
}
+void ChromeShellDelegate::ShowTaskManager() {
+ Browser* browser = browser::FindOrCreateTabbedBrowser(
+ ProfileManager::GetDefaultProfileOrOffTheRecord());
+ browser->OpenTaskManager(false);
+}
+
content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() {
return ProfileManager::GetDefaultProfile();
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698