Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 5 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 const FilePath& cur_dir, | 41 const FilePath& cur_dir, |
| 42 Profile* last_used_profile, | 42 Profile* last_used_profile, |
| 43 const Profiles& last_opened_profiles, | 43 const Profiles& last_opened_profiles, |
| 44 int* return_code) { | 44 int* return_code) { |
| 45 return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_used_profile, | 45 return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_used_profile, |
| 46 last_opened_profiles, return_code, this); | 46 last_opened_profiles, return_code, this); |
| 47 } | 47 } |
| 48 | 48 |
| 49 // This function performs command-line handling and is invoked only after | 49 // This function performs command-line handling and is invoked only after |
| 50 // start up (for example when we get a start request for another process). | 50 // start up (for example when we get a start request for another process). |
| 51 // |command_line| holds the command line we need to process | 51 // |command_line| holds the command line we need to process |
|
tapted
2013/01/21 00:37:02
nit: while you're here - comment is missing a peri
koz (OOO until 15th September)
2013/01/21 23:23:15
Done.
| |
| 52 static void ProcessCommandLineAlreadyRunning(const CommandLine& cmd_line, | 52 static void ProcessCommandLineAlreadyRunning( |
| 53 const FilePath& cur_dir); | 53 const CommandLine& cmd_line, |
|
tapted
2013/01/21 00:37:02
nit: while you're here.. 'cmd_line' got abbreviate
koz (OOO until 15th September)
2013/01/21 23:23:15
Done.
| |
| 54 const FilePath& cur_dir, | |
| 55 const FilePath& startup_profile_dir); | |
| 54 | 56 |
| 55 template <class AutomationProviderClass> | 57 template <class AutomationProviderClass> |
| 56 static bool CreateAutomationProvider(const std::string& channel_id, | 58 static bool CreateAutomationProvider(const std::string& channel_id, |
| 57 Profile* profile, | 59 Profile* profile, |
| 58 size_t expected_tabs); | 60 size_t expected_tabs); |
| 59 | 61 |
| 60 // Returns true if we're launching a profile synchronously. In that case, the | 62 // Returns true if we're launching a profile synchronously. In that case, the |
| 61 // opened window should not cause a session restore. | 63 // opened window should not cause a session restore. |
| 62 static bool InSynchronousProfileLaunch(); | 64 static bool InSynchronousProfileLaunch(); |
| 63 | 65 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 // member variable instead of a static variable inside WasRestarted because | 151 // member variable instead of a static variable inside WasRestarted because |
| 150 // of testing.) | 152 // of testing.) |
| 151 static bool was_restarted_read_; | 153 static bool was_restarted_read_; |
| 152 | 154 |
| 153 static bool in_synchronous_profile_launch_; | 155 static bool in_synchronous_profile_launch_; |
| 154 | 156 |
| 155 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreator); | 157 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreator); |
| 156 }; | 158 }; |
| 157 | 159 |
| 158 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 160 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| OLD | NEW |