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

Unified Diff: chrome/browser/sessions/session_restore.cc

Issue 9359022: Aura: Support hovering restore & close buttons for full screen apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added new test for tab restore Created 8 years, 10 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
Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 2ee07100f5a6d0d6e92145c39ebe6ef5a7c18ede..a19f047e4fa65a4d75d501deb038c5baff0524a9 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -503,7 +503,8 @@ class SessionRestoreImpl : public content::NotificationObserver {
Browser* browser = CreateRestoredBrowser(
static_cast<Browser::Type>((*i)->type),
(*i)->bounds,
- (*i)->show_state);
+ (*i)->show_state,
+ (*i)->app_name);
// Restore and show the browser.
const int initial_tab_count = browser->tab_count();
@@ -692,7 +693,10 @@ class SessionRestoreImpl : public content::NotificationObserver {
}
browser = CreateRestoredBrowser(
- static_cast<Browser::Type>((*i)->type), (*i)->bounds, show_state);
+ static_cast<Browser::Type>((*i)->type),
+ (*i)->bounds,
+ show_state,
+ (*i)->app_name);
#if defined(OS_CHROMEOS)
chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
"SessionRestore-CreateRestoredBrowser-End", false);
@@ -804,13 +808,14 @@ class SessionRestoreImpl : public content::NotificationObserver {
Browser* CreateRestoredBrowser(Browser::Type type,
gfx::Rect bounds,
- ui::WindowShowState show_state) {
- Browser* browser = new Browser(type, profile_);
- browser->set_override_bounds(bounds);
- browser->set_show_state(show_state);
- browser->set_is_session_restore(true);
- browser->InitBrowserWindow();
- return browser;
+ ui::WindowShowState show_state,
+ const std::string app_name) {
sky 2012/02/24 20:56:04 const std::string&
DaveMoore 2012/02/25 16:54:42 Done.
+ Browser::CreateParams params(type, profile_);
+ params.app_name = app_name;
+ params.initial_bounds = bounds;
+ params.initial_show_state = show_state;
+ params.is_session_restore = true;
+ return Browser::CreateWithParams(params);
}
void ShowBrowser(Browser* browser,

Powered by Google App Engine
This is Rietveld 408576698