| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 98 |
| 99 #if defined(TOOLKIT_GTK) | 99 #if defined(TOOLKIT_GTK) |
| 100 #include "chrome/browser/ui/gtk/gtk_util.h" | 100 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 101 #endif | 101 #endif |
| 102 | 102 |
| 103 #if defined(OS_WIN) | 103 #if defined(OS_WIN) |
| 104 #include "base/win/windows_version.h" | 104 #include "base/win/windows_version.h" |
| 105 #endif | 105 #endif |
| 106 | 106 |
| 107 #if defined(ENABLE_APP_LIST) | 107 #if defined(ENABLE_APP_LIST) |
| 108 #include "chrome/browser/ui/app_list/app_list_controller.h" | 108 #include "chrome/browser/ui/app_list/app_list_util.h" |
| 109 #endif | 109 #endif |
| 110 | 110 |
| 111 using content::ChildProcessSecurityPolicy; | 111 using content::ChildProcessSecurityPolicy; |
| 112 using content::WebContents; | 112 using content::WebContents; |
| 113 using extensions::Extension; | 113 using extensions::Extension; |
| 114 | 114 |
| 115 namespace { | 115 namespace { |
| 116 | 116 |
| 117 // Utility functions ---------------------------------------------------------- | 117 // Utility functions ---------------------------------------------------------- |
| 118 | 118 |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 chrome_browser_net::EnablePredictorDetailedLog(true); | 329 chrome_browser_net::EnablePredictorDetailedLog(true); |
| 330 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && | 330 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && |
| 331 profile->GetNetworkPredictor()) { | 331 profile->GetNetworkPredictor()) { |
| 332 profile->GetNetworkPredictor()->EnablePredictor(false); | 332 profile->GetNetworkPredictor()->EnablePredictor(false); |
| 333 } | 333 } |
| 334 | 334 |
| 335 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) | 335 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) |
| 336 base::StatisticsRecorder::set_dump_on_exit(true); | 336 base::StatisticsRecorder::set_dump_on_exit(true); |
| 337 | 337 |
| 338 #if defined(ENABLE_APP_LIST) | 338 #if defined(ENABLE_APP_LIST) |
| 339 app_list_controller::InitAppList(); | 339 chrome::InitAppList(); |
| 340 if (command_line_.HasSwitch(switches::kShowAppList)) { | 340 if (command_line_.HasSwitch(switches::kShowAppList)) { |
| 341 app_list_controller::ShowAppList(); | 341 chrome::ShowAppList(); |
| 342 return true; | 342 return true; |
| 343 } | 343 } |
| 344 #endif | 344 #endif |
| 345 | 345 |
| 346 // Open the required browser windows and tabs. First, see if | 346 // Open the required browser windows and tabs. First, see if |
| 347 // we're being run as an application window. If so, the user | 347 // we're being run as an application window. If so, the user |
| 348 // opened an app shortcut. Don't restore tabs or open initial | 348 // opened an app shortcut. Don't restore tabs or open initial |
| 349 // URLs in that case. The user should see the window as an app, | 349 // URLs in that case. The user should see the window as an app, |
| 350 // not as chrome. | 350 // not as chrome. |
| 351 // Special case is when app switches are passed but we do want to restore | 351 // Special case is when app switches are passed but we do want to restore |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 } | 956 } |
| 957 | 957 |
| 958 #if !defined(OS_WIN) || defined(USE_AURA) | 958 #if !defined(OS_WIN) || defined(USE_AURA) |
| 959 // static | 959 // static |
| 960 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 960 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| 961 Profile* profile, | 961 Profile* profile, |
| 962 const std::vector<GURL>& startup_urls) { | 962 const std::vector<GURL>& startup_urls) { |
| 963 return false; | 963 return false; |
| 964 } | 964 } |
| 965 #endif | 965 #endif |
| OLD | NEW |