| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #ifndef CHROME_BROWSER_BROWSER_INIT_H_ | 5 #ifndef CHROME_BROWSER_BROWSER_INIT_H_ |
| 6 #define CHROME_BROWSER_BROWSER_INIT_H_ | 6 #define CHROME_BROWSER_BROWSER_INIT_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 const std::wstring& cur_dir, | 95 const std::wstring& cur_dir, |
| 96 PrefService* prefs, bool process_startup, | 96 PrefService* prefs, bool process_startup, |
| 97 Profile* profile, int* return_code); | 97 Profile* profile, int* return_code); |
| 98 | 98 |
| 99 // Helper function to launch a new browser based on command-line arguments | 99 // Helper function to launch a new browser based on command-line arguments |
| 100 // This function takes in a specific profile to use. | 100 // This function takes in a specific profile to use. |
| 101 static bool LaunchBrowser(const CommandLine& command_line, | 101 static bool LaunchBrowser(const CommandLine& command_line, |
| 102 Profile* profile, const std::wstring& cur_dir, | 102 Profile* profile, const std::wstring& cur_dir, |
| 103 bool process_startup, int* return_code); | 103 bool process_startup, int* return_code); |
| 104 | 104 |
| 105 #if defined(OS_WIN) | |
| 106 template <class AutomationProviderClass> | 105 template <class AutomationProviderClass> |
| 107 static void CreateAutomationProvider(const std::wstring& channel_id, | 106 static void CreateAutomationProvider(const std::wstring& channel_id, |
| 108 Profile* profile, | 107 Profile* profile, |
| 109 size_t expected_tabs); | 108 size_t expected_tabs); |
| 110 #endif | |
| 111 | 109 |
| 112 private: | 110 private: |
| 113 // Does the work of LaunchBrowser returning the result. | 111 // Does the work of LaunchBrowser returning the result. |
| 114 static bool LaunchBrowserImpl(const CommandLine& command_line, | 112 static bool LaunchBrowserImpl(const CommandLine& command_line, |
| 115 Profile* profile, const std::wstring& cur_dir, | 113 Profile* profile, const std::wstring& cur_dir, |
| 116 bool process_startup, int* return_code); | 114 bool process_startup, int* return_code); |
| 117 | 115 |
| 118 // This class is for scoping purposes. | 116 // This class is for scoping purposes. |
| 119 BrowserInit(); | 117 BrowserInit(); |
| 120 DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 118 DISALLOW_COPY_AND_ASSIGN(BrowserInit); |
| 121 }; | 119 }; |
| 122 | 120 |
| 123 #endif // CHROME_BROWSER_BROWSER_INIT_H_ | 121 #endif // CHROME_BROWSER_BROWSER_INIT_H_ |
| 124 | 122 |
| OLD | NEW |