OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" | 53 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" |
54 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" | 54 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" |
55 #include "chrome/browser/net/metadata_url_request.h" | 55 #include "chrome/browser/net/metadata_url_request.h" |
56 #include "chrome/browser/net/predictor_api.h" | 56 #include "chrome/browser/net/predictor_api.h" |
57 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 57 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
58 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" | 58 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" |
59 #include "chrome/browser/plugin_service.h" | 59 #include "chrome/browser/plugin_service.h" |
60 #include "chrome/browser/prefs/pref_service.h" | 60 #include "chrome/browser/prefs/pref_service.h" |
61 #include "chrome/browser/prefs/pref_value_store.h" | 61 #include "chrome/browser/prefs/pref_value_store.h" |
62 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 62 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
63 #include "chrome/browser/printing/print_dialog_cloud.h" | |
63 #include "chrome/browser/process_singleton.h" | 64 #include "chrome/browser/process_singleton.h" |
64 #include "chrome/browser/profiles/profile.h" | 65 #include "chrome/browser/profiles/profile.h" |
65 #include "chrome/browser/profiles/profile_manager.h" | 66 #include "chrome/browser/profiles/profile_manager.h" |
66 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 67 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
67 #include "chrome/browser/search_engines/search_engine_type.h" | 68 #include "chrome/browser/search_engines/search_engine_type.h" |
68 #include "chrome/browser/search_engines/template_url.h" | 69 #include "chrome/browser/search_engines/template_url.h" |
69 #include "chrome/browser/search_engines/template_url_model.h" | 70 #include "chrome/browser/search_engines/template_url_model.h" |
70 #include "chrome/browser/service/service_process_control.h" | 71 #include "chrome/browser/service/service_process_control.h" |
71 #include "chrome/browser/service/service_process_control_manager.h" | 72 #include "chrome/browser/service/service_process_control_manager.h" |
72 #include "chrome/browser/shell_integration.h" | 73 #include "chrome/browser/shell_integration.h" |
(...skipping 1543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1616 // TODO(hclam): Need to check for cloud print proxy too. | 1617 // TODO(hclam): Need to check for cloud print proxy too. |
1617 if (parsed_command_line.HasSwitch(switches::kEnableRemoting)) { | 1618 if (parsed_command_line.HasSwitch(switches::kEnableRemoting)) { |
1618 if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) { | 1619 if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) { |
1619 ServiceProcessControl* control = | 1620 ServiceProcessControl* control = |
1620 ServiceProcessControlManager::GetInstance()->GetProcessControl( | 1621 ServiceProcessControlManager::GetInstance()->GetProcessControl( |
1621 profile); | 1622 profile); |
1622 control->Launch(NULL, NULL); | 1623 control->Launch(NULL, NULL); |
1623 } | 1624 } |
1624 } | 1625 } |
1625 | 1626 |
1627 if (parsed_command_line.HasSwitch(switches::kCloudPrintFile)) { | |
1628 FilePath cloud_print_file; | |
1629 cloud_print_file = | |
1630 parsed_command_line.GetSwitchValuePath(switches::kCloudPrintFile); | |
sanjeevr
2011/01/11 21:39:55
If GetSwitchValuePath returns empty, perhaps we sh
abodenha
2011/01/12 01:30:50
Done.
| |
1631 | |
1632 PrintDialogCloud::CreatePrintDialogForPdf(cloud_print_file); | |
1633 } | |
1634 | |
1626 #if defined(OS_CHROMEOS) | 1635 #if defined(OS_CHROMEOS) |
1627 // Run the Out of Memory priority manager while in this scope. Wait | 1636 // Run the Out of Memory priority manager while in this scope. Wait |
1628 // until here to start so that we give the most amount of time for | 1637 // until here to start so that we give the most amount of time for |
1629 // the other services to start up before we start adjusting the oom | 1638 // the other services to start up before we start adjusting the oom |
1630 // priority. In reality, it doesn't matter much where in this scope | 1639 // priority. In reality, it doesn't matter much where in this scope |
1631 // this is started, but it must be started in this scope so it will | 1640 // this is started, but it must be started in this scope so it will |
1632 // also be terminated when this scope exits. | 1641 // also be terminated when this scope exits. |
1633 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( | 1642 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( |
1634 new browser::OomPriorityManager); | 1643 new browser::OomPriorityManager); |
1635 #endif | 1644 #endif |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1735 #if defined(OS_CHROMEOS) | 1744 #if defined(OS_CHROMEOS) |
1736 // To be precise, logout (browser shutdown) is not yet done, but the | 1745 // To be precise, logout (browser shutdown) is not yet done, but the |
1737 // remaining work is negligible, hence we say LogoutDone here. | 1746 // remaining work is negligible, hence we say LogoutDone here. |
1738 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1747 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
1739 false); | 1748 false); |
1740 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1749 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
1741 #endif | 1750 #endif |
1742 TRACE_EVENT_END("BrowserMain", 0, 0); | 1751 TRACE_EVENT_END("BrowserMain", 0, 0); |
1743 return result_code; | 1752 return result_code; |
1744 } | 1753 } |
OLD | NEW |