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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 #include "chrome/browser/search_engines/template_url.h" | 89 #include "chrome/browser/search_engines/template_url.h" |
90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
91 #include "chrome/browser/search_engines/template_url_service.h" | 91 #include "chrome/browser/search_engines/template_url_service.h" |
92 #include "chrome/browser/search_engines/template_url_service_factory.h" | 92 #include "chrome/browser/search_engines/template_url_service_factory.h" |
93 #include "chrome/browser/service/service_process_control.h" | 93 #include "chrome/browser/service/service_process_control.h" |
94 #include "chrome/browser/shell_integration.h" | 94 #include "chrome/browser/shell_integration.h" |
95 #include "chrome/browser/translate/translate_manager.h" | 95 #include "chrome/browser/translate/translate_manager.h" |
96 #include "chrome/browser/ui/app_list/app_list_util.h" | 96 #include "chrome/browser/ui/app_list/app_list_util.h" |
97 #include "chrome/browser/ui/browser.h" | 97 #include "chrome/browser/ui/browser.h" |
98 #include "chrome/browser/ui/browser_finder.h" | 98 #include "chrome/browser/ui/browser_finder.h" |
| 99 #include "chrome/browser/ui/host_desktop.h" |
99 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 100 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
100 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 101 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
101 #include "chrome/browser/ui/uma_browsing_activity_observer.h" | 102 #include "chrome/browser/ui/uma_browsing_activity_observer.h" |
102 #include "chrome/browser/ui/user_data_dir_dialog.h" | 103 #include "chrome/browser/ui/user_data_dir_dialog.h" |
103 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 104 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
104 #include "chrome/common/child_process_logging.h" | 105 #include "chrome/common/child_process_logging.h" |
105 #include "chrome/common/chrome_constants.h" | 106 #include "chrome/common/chrome_constants.h" |
106 #include "chrome/common/chrome_paths.h" | 107 #include "chrome/common/chrome_paths.h" |
107 #include "chrome/common/chrome_result_codes.h" | 108 #include "chrome/common/chrome_result_codes.h" |
108 #include "chrome/common/chrome_switches.h" | 109 #include "chrome/common/chrome_switches.h" |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); | 538 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); |
538 int port; | 539 int port; |
539 if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) { | 540 if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) { |
540 std::string frontend_str; | 541 std::string frontend_str; |
541 if (command_line.HasSwitch(::switches::kRemoteDebuggingFrontend)) { | 542 if (command_line.HasSwitch(::switches::kRemoteDebuggingFrontend)) { |
542 frontend_str = command_line.GetSwitchValueASCII( | 543 frontend_str = command_line.GetSwitchValueASCII( |
543 ::switches::kRemoteDebuggingFrontend); | 544 ::switches::kRemoteDebuggingFrontend); |
544 } | 545 } |
545 g_browser_process->CreateDevToolsHttpProtocolHandler( | 546 g_browser_process->CreateDevToolsHttpProtocolHandler( |
546 profile, | 547 profile, |
| 548 chrome::HOST_DESKTOP_TYPE_NATIVE, |
547 "127.0.0.1", | 549 "127.0.0.1", |
548 port, | 550 port, |
549 frontend_str); | 551 frontend_str); |
550 } else { | 552 } else { |
551 DLOG(WARNING) << "Invalid http debugger port number " << port; | 553 DLOG(WARNING) << "Invalid http debugger port number " << port; |
552 } | 554 } |
553 } | 555 } |
554 } | 556 } |
555 | 557 |
556 // Heap allocated class that listens for first page load, kicks off stat | 558 // Heap allocated class that listens for first page load, kicks off stat |
(...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1795 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1797 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1796 uma_name += "_XP"; | 1798 uma_name += "_XP"; |
1797 | 1799 |
1798 uma_name += "_PreRead_"; | 1800 uma_name += "_PreRead_"; |
1799 uma_name += pre_read_percentage; | 1801 uma_name += pre_read_percentage; |
1800 AddPreReadHistogramTime(uma_name.c_str(), time); | 1802 AddPreReadHistogramTime(uma_name.c_str(), time); |
1801 } | 1803 } |
1802 #endif | 1804 #endif |
1803 #endif | 1805 #endif |
1804 } | 1806 } |
OLD | NEW |