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

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 10356059: Merge 135882 - [cros] Show release notes in app window + restore sesssion. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1084/src/
Patch Set: 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/defaults.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init.cc
===================================================================
--- chrome/browser/ui/browser_init.cc (revision 135895)
+++ chrome/browser/ui/browser_init.cc (working copy)
@@ -900,9 +900,16 @@
// opened an app shortcut. Don't restore tabs or open initial
// URLs in that case. The user should see the window as an app,
// not as chrome.
- if (OpenApplicationWindow(profile)) {
+ // Special case is when app switches are passed but we do want to restore
+ // session. In that case open app window + focus it after session is restored.
+ if (OpenApplicationWindow(profile) && !browser_defaults::kAppRestoreSession) {
RecordLaunchModeHistogram(LM_AS_WEBAPP);
} else {
+ Browser* browser_to_focus = NULL;
+ // In case of app mode + session restore we want to focus that app.
+ if (browser_defaults::kAppRestoreSession)
+ browser_to_focus = BrowserList::GetLastActive();
+
RecordLaunchModeHistogram(urls_to_open.empty()?
LM_TO_BE_DECIDED : LM_WITH_URLS);
@@ -916,6 +923,9 @@
// be an app tab.
OpenApplicationTab(profile);
+ if (browser_to_focus)
+ browser_to_focus->GetSelectedWebContents()->GetView()->SetInitialFocus();
+
if (process_startup) {
if (browser_defaults::kOSSupportsOtherBrowsers &&
!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
« no previous file with comments | « chrome/browser/defaults.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698