| 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/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 if (!profile_ && browser) | 659 if (!profile_ && browser) |
| 660 profile_ = browser->profile(); | 660 profile_ = browser->profile(); |
| 661 | 661 |
| 662 if (!browser || !browser->is_type_tabbed()) { | 662 if (!browser || !browser->is_type_tabbed()) { |
| 663 browser = Browser::Create(profile_); | 663 browser = Browser::Create(profile_); |
| 664 } else { | 664 } else { |
| 665 #if defined(TOOLKIT_GTK) | 665 #if defined(TOOLKIT_GTK) |
| 666 // Setting the time of the last action on the window here allows us to steal | 666 // Setting the time of the last action on the window here allows us to steal |
| 667 // focus, which is what the user wants when opening a new tab in an existing | 667 // focus, which is what the user wants when opening a new tab in an existing |
| 668 // browser window. | 668 // browser window. |
| 669 gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle()); | 669 gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeWindow()); |
| 670 #endif | 670 #endif |
| 671 } | 671 } |
| 672 | 672 |
| 673 #if !defined(OS_MACOSX) | 673 #if !defined(OS_MACOSX) |
| 674 // In kiosk mode, we want to always be fullscreen, so switch to that now. | 674 // In kiosk mode, we want to always be fullscreen, so switch to that now. |
| 675 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 675 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) |
| 676 browser->ToggleFullscreenMode(); | 676 browser->ToggleFullscreenMode(); |
| 677 #endif | 677 #endif |
| 678 | 678 |
| 679 bool first_tab = true; | 679 bool first_tab = true; |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 // New: | 856 // New: |
| 857 prefs->GetString(prefs::kHomePage), | 857 prefs->GetString(prefs::kHomePage), |
| 858 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), | 858 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), |
| 859 prefs->GetBoolean(prefs::kShowHomeButton), | 859 prefs->GetBoolean(prefs::kShowHomeButton), |
| 860 // Backup: | 860 // Backup: |
| 861 backup_homepage, | 861 backup_homepage, |
| 862 backup_homepage_is_ntp, | 862 backup_homepage_is_ntp, |
| 863 backup_show_home_button)); | 863 backup_show_home_button)); |
| 864 } | 864 } |
| 865 } | 865 } |
| OLD | NEW |