| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/file_path.h" | 13 #include "base/file_path.h" |
| 14 #include "base/gtest_prod_util.h" | 14 #include "base/gtest_prod_util.h" |
| 15 #include "chrome/browser/prefs/session_startup_pref.h" | 15 #include "chrome/browser/prefs/session_startup_pref.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/ui/startup/startup_tab.h" |
| 17 #include "chrome/browser/ui/startup/startup_types.h" | 18 #include "chrome/browser/ui/startup/startup_types.h" |
| 18 #include "chrome/browser/ui/startup/startup_tab.h" | |
| 19 #include "googleurl/src/gurl.h" | 19 #include "googleurl/src/gurl.h" |
| 20 | 20 |
| 21 class Browser; | 21 class Browser; |
| 22 class CommandLine; | 22 class CommandLine; |
| 23 class GURL; | 23 class GURL; |
| 24 class PrefService; | 24 class PrefService; |
| 25 class TabContents; | 25 class TabContents; |
| 26 | 26 |
| 27 // class containing helpers for BrowserMain to spin up a new instance and | 27 // class containing helpers for BrowserMain to spin up a new instance and |
| 28 // initialize the profile. | 28 // initialize the profile. |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 static bool InSynchronousProfileLaunch(); | 64 static bool InSynchronousProfileLaunch(); |
| 65 | 65 |
| 66 // Launches a browser window associated with |profile|. |command_line| should | 66 // Launches a browser window associated with |profile|. |command_line| should |
| 67 // be the command line passed to this process. |cur_dir| can be empty, which | 67 // be the command line passed to this process. |cur_dir| can be empty, which |
| 68 // implies that the directory of the executable should be used. | 68 // implies that the directory of the executable should be used. |
| 69 // |process_startup| indicates whether this is the first browser. | 69 // |process_startup| indicates whether this is the first browser. |
| 70 // |is_first_run| indicates that this is a new profile. | 70 // |is_first_run| indicates that this is a new profile. |
| 71 bool LaunchBrowser(const CommandLine& command_line, | 71 bool LaunchBrowser(const CommandLine& command_line, |
| 72 Profile* profile, | 72 Profile* profile, |
| 73 const FilePath& cur_dir, | 73 const FilePath& cur_dir, |
| 74 browser::startup::IsProcessStartup is_process_startup, | 74 chrome::startup::IsProcessStartup is_process_startup, |
| 75 browser::startup::IsFirstRun is_first_run, | 75 chrome::startup::IsFirstRun is_first_run, |
| 76 int* return_code); | 76 int* return_code); |
| 77 | 77 |
| 78 // When called the first time, reads the value of the preference kWasRestarted | 78 // When called the first time, reads the value of the preference kWasRestarted |
| 79 // and resets it to false. Subsequent calls return the value which was read | 79 // and resets it to false. Subsequent calls return the value which was read |
| 80 // the first time. | 80 // the first time. |
| 81 static bool WasRestarted(); | 81 static bool WasRestarted(); |
| 82 | 82 |
| 83 static SessionStartupPref GetSessionStartupPref( | 83 static SessionStartupPref GetSessionStartupPref( |
| 84 const CommandLine& command_line, | 84 const CommandLine& command_line, |
| 85 Profile* profile); | 85 Profile* profile); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 121 |
| 122 // True if we have already read and reset the preference kWasRestarted. (A | 122 // True if we have already read and reset the preference kWasRestarted. (A |
| 123 // member variable instead of a static variable inside WasRestarted because | 123 // member variable instead of a static variable inside WasRestarted because |
| 124 // of testing.) | 124 // of testing.) |
| 125 static bool was_restarted_read_; | 125 static bool was_restarted_read_; |
| 126 | 126 |
| 127 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreator); | 127 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreator); |
| 128 }; | 128 }; |
| 129 | 129 |
| 130 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 130 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| OLD | NEW |