| 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 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| 6 #define CHROME_BROWSER_UI_BROWSER_INIT_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <string> | 9 #include <string> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 46   // |process_startup| is true and we are being called from | 46   // |process_startup| is true and we are being called from | 
| 47   // ProcessSingleton::OnCopyData). | 47   // ProcessSingleton::OnCopyData). | 
| 48   static bool ProcessCommandLine(const CommandLine& cmd_line, | 48   static bool ProcessCommandLine(const CommandLine& cmd_line, | 
| 49                                  const FilePath& cur_dir, bool process_startup, | 49                                  const FilePath& cur_dir, bool process_startup, | 
| 50                                  Profile* profile, int* return_code) { | 50                                  Profile* profile, int* return_code) { | 
| 51     return ProcessCmdLineImpl(cmd_line, cur_dir, process_startup, profile, | 51     return ProcessCmdLineImpl(cmd_line, cur_dir, process_startup, profile, | 
| 52                               return_code, NULL); | 52                               return_code, NULL); | 
| 53   } | 53   } | 
| 54 | 54 | 
| 55   template <class AutomationProviderClass> | 55   template <class AutomationProviderClass> | 
| 56   static bool CreateAutomationProvider(const std::string& channel_id, | 56   static void CreateAutomationProvider(const std::string& channel_id, | 
| 57                                        Profile* profile, | 57                                        Profile* profile, | 
| 58                                        size_t expected_tabs); | 58                                        size_t expected_tabs); | 
| 59 | 59 | 
| 60   // Returns true if the browser is coming up. | 60   // Returns true if the browser is coming up. | 
| 61   static bool InProcessStartup(); | 61   static bool InProcessStartup(); | 
| 62 | 62 | 
| 63   // Launches a browser window associated with |profile|. |command_line| should | 63   // Launches a browser window associated with |profile|. |command_line| should | 
| 64   // be the command line passed to this process. |cur_dir| can be empty, which | 64   // be the command line passed to this process. |cur_dir| can be empty, which | 
| 65   // implies that the directory of the executable should be used. | 65   // implies that the directory of the executable should be used. | 
| 66   // |process_startup| indicates whether this is the first browser. | 66   // |process_startup| indicates whether this is the first browser. | 
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 190                                  Profile* profile, int* return_code, | 190                                  Profile* profile, int* return_code, | 
| 191                                  BrowserInit* browser_init); | 191                                  BrowserInit* browser_init); | 
| 192 | 192 | 
| 193   // Additional tabs to open during first run. | 193   // Additional tabs to open during first run. | 
| 194   std::vector<GURL> first_run_tabs_; | 194   std::vector<GURL> first_run_tabs_; | 
| 195 | 195 | 
| 196   DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 196   DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 
| 197 }; | 197 }; | 
| 198 | 198 | 
| 199 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_ | 199 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| OLD | NEW | 
|---|