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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 g_browser_process->CreateDevToolsHttpProtocolHandler( | 355 g_browser_process->CreateDevToolsHttpProtocolHandler( |
356 profile, | 356 profile, |
357 "127.0.0.1", | 357 "127.0.0.1", |
358 static_cast<int>(port), | 358 static_cast<int>(port), |
359 frontend_str); | 359 frontend_str); |
360 } else { | 360 } else { |
361 DLOG(WARNING) << "Invalid http debugger port number " << port; | 361 DLOG(WARNING) << "Invalid http debugger port number " << port; |
362 } | 362 } |
363 } | 363 } |
364 | 364 |
| 365 app_list_controller::CheckAppListTaskbarShortcut(); |
365 if (command_line_.HasSwitch(switches::kShowAppList)) { | 366 if (command_line_.HasSwitch(switches::kShowAppList)) { |
366 app_list_controller::ShowAppList(); | 367 app_list_controller::ShowAppList(); |
367 return true; | 368 return true; |
368 } | 369 } |
369 | 370 |
370 // Open the required browser windows and tabs. First, see if | 371 // Open the required browser windows and tabs. First, see if |
371 // we're being run as an application window. If so, the user | 372 // we're being run as an application window. If so, the user |
372 // opened an app shortcut. Don't restore tabs or open initial | 373 // opened an app shortcut. Don't restore tabs or open initial |
373 // URLs in that case. The user should see the window as an app, | 374 // URLs in that case. The user should see the window as an app, |
374 // not as chrome. | 375 // not as chrome. |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1041 | 1042 |
1042 #if !defined(OS_WIN) || defined(USE_AURA) | 1043 #if !defined(OS_WIN) || defined(USE_AURA) |
1043 // static | 1044 // static |
1044 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 1045 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
1045 Profile* profile, | 1046 Profile* profile, |
1046 const std::vector<GURL>& startup_urls) { | 1047 const std::vector<GURL>& startup_urls) { |
1047 return false; | 1048 return false; |
1048 } | 1049 } |
1049 #endif | 1050 #endif |
1050 | 1051 |
OLD | NEW |