OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 DCHECK(!tabs.empty()); | 1044 DCHECK(!tabs.empty()); |
1045 // If we don't yet have a profile, try to use the one we're given from | 1045 // If we don't yet have a profile, try to use the one we're given from |
1046 // |browser|. While we may not end up actually using |browser| (since it | 1046 // |browser|. While we may not end up actually using |browser| (since it |
1047 // could be a popup window), we can at least use the profile. | 1047 // could be a popup window), we can at least use the profile. |
1048 if (!profile_ && browser) | 1048 if (!profile_ && browser) |
1049 profile_ = browser->profile(); | 1049 profile_ = browser->profile(); |
1050 | 1050 |
1051 if (!browser || !browser->is_type_tabbed()) { | 1051 if (!browser || !browser->is_type_tabbed()) { |
1052 browser = Browser::Create(profile_); | 1052 browser = Browser::Create(profile_); |
1053 } else { | 1053 } else { |
1054 #if defined(TOOLKIT_GTK) && !defined(USE_AURA) | 1054 #if defined(TOOLKIT_GTK) |
1055 // Setting the time of the last action on the window here allows us to steal | 1055 // Setting the time of the last action on the window here allows us to steal |
1056 // focus, which is what the user wants when opening a new tab in an existing | 1056 // focus, which is what the user wants when opening a new tab in an existing |
1057 // browser window. | 1057 // browser window. |
1058 gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle()); | 1058 gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle()); |
1059 #endif | 1059 #endif |
1060 } | 1060 } |
1061 | 1061 |
1062 #if !defined(OS_MACOSX) | 1062 #if !defined(OS_MACOSX) |
1063 // In kiosk mode, we want to always be fullscreen, so switch to that now. | 1063 // In kiosk mode, we want to always be fullscreen, so switch to that now. |
1064 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 1064 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1549 if (!automation->InitializeChannel(channel_id)) | 1549 if (!automation->InitializeChannel(channel_id)) |
1550 return false; | 1550 return false; |
1551 automation->SetExpectedTabCount(expected_tabs); | 1551 automation->SetExpectedTabCount(expected_tabs); |
1552 | 1552 |
1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); | 1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); |
1554 DCHECK(list); | 1554 DCHECK(list); |
1555 list->AddProvider(automation); | 1555 list->AddProvider(automation); |
1556 | 1556 |
1557 return true; | 1557 return true; |
1558 } | 1558 } |
OLD | NEW |