| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 // This function performs command-line handling and is invoked when | 88 // This function performs command-line handling and is invoked when |
| 89 // process starts as well as when we get a start request from another | 89 // process starts as well as when we get a start request from another |
| 90 // process (via the WM_COPYDATA message). |command_line| holds the command | 90 // process (via the WM_COPYDATA message). |command_line| holds the command |
| 91 // line we need to process - either from this process or from some other one | 91 // line we need to process - either from this process or from some other one |
| 92 // (if |process_startup| is true and we are being called from | 92 // (if |process_startup| is true and we are being called from |
| 93 // ProcessSingleton::OnCopyData). | 93 // ProcessSingleton::OnCopyData). |
| 94 static bool ProcessCommandLine(const CommandLine& command_line, | 94 static bool ProcessCommandLine(const CommandLine& command_line, |
| 95 const std::wstring& cur_dir, | 95 const std::wstring& cur_dir, |
| 96 PrefService* prefs, bool process_startup, | 96 bool process_startup, Profile* profile, |
| 97 Profile* profile, int* return_code); | 97 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 template <class AutomationProviderClass> | 105 template <class AutomationProviderClass> |
| 106 static void CreateAutomationProvider(const std::wstring& channel_id, | 106 static void CreateAutomationProvider(const std::wstring& channel_id, |
| 107 Profile* profile, | 107 Profile* profile, |
| 108 size_t expected_tabs); | 108 size_t expected_tabs); |
| 109 | 109 |
| 110 private: | 110 private: |
| 111 // Does the work of LaunchBrowser returning the result. | 111 // Does the work of LaunchBrowser returning the result. |
| 112 static bool LaunchBrowserImpl(const CommandLine& command_line, | 112 static bool LaunchBrowserImpl(const CommandLine& command_line, |
| 113 Profile* profile, const std::wstring& cur_dir, | 113 Profile* profile, const std::wstring& cur_dir, |
| 114 bool process_startup, int* return_code); | 114 bool process_startup, int* return_code); |
| 115 | 115 |
| 116 // This class is for scoping purposes. | 116 // This class is for scoping purposes. |
| 117 BrowserInit(); | 117 BrowserInit(); |
| 118 DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 118 DISALLOW_COPY_AND_ASSIGN(BrowserInit); |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 #endif // CHROME_BROWSER_BROWSER_INIT_H_ | 121 #endif // CHROME_BROWSER_BROWSER_INIT_H_ |
| OLD | NEW |