| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 // Launches a browser window associated with |profile|. |command_line| | 70 // Launches a browser window associated with |profile|. |command_line| |
| 71 // should be the command line passed to this process. |cur_dir| can be | 71 // should be the command line passed to this process. |cur_dir| can be |
| 72 // the null string, which implies that the directory of the executable. | 72 // the null string, which implies that the directory of the executable. |
| 73 // should be used. |process_startup| indicates whether this is the | 73 // should be used. |process_startup| indicates whether this is the |
| 74 // first browser. | 74 // first browser. |
| 75 bool LaunchBrowser(const CommandLine& command_line, Profile* profile, | 75 bool LaunchBrowser(const CommandLine& command_line, Profile* profile, |
| 76 const std::wstring& cur_dir, bool process_startup, | 76 const std::wstring& cur_dir, bool process_startup, |
| 77 int* return_code); | 77 int* return_code); |
| 78 | 78 |
| 79 #if defined(OS_CHROMEOS) | |
| 80 // Processes the OEM services customization document and modifies browser | |
| 81 // settings like initial startup page, web apps and extentions. | |
| 82 bool ApplyServicesCustomization( | |
| 83 const chromeos::ServicesCustomizationDocument* customization); | |
| 84 #endif | |
| 85 | |
| 86 // LaunchWithProfile --------------------------------------------------------- | 79 // LaunchWithProfile --------------------------------------------------------- |
| 87 // | 80 // |
| 88 // Assists launching the application and appending the initial tabs for a | 81 // Assists launching the application and appending the initial tabs for a |
| 89 // browser window. | 82 // browser window. |
| 90 | 83 |
| 91 class LaunchWithProfile { | 84 class LaunchWithProfile { |
| 92 public: | 85 public: |
| 93 // Used by OpenTabsInBrowser. | 86 // Used by OpenTabsInBrowser. |
| 94 struct Tab { | 87 struct Tab { |
| 95 Tab() : is_app(false), is_pinned(true) {} | 88 Tab() : is_app(false), is_pinned(true) {} |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 bool process_startup, Profile* profile, | 199 bool process_startup, Profile* profile, |
| 207 int* return_code, BrowserInit* browser_init); | 200 int* return_code, BrowserInit* browser_init); |
| 208 | 201 |
| 209 // Additional tabs to open during first run. | 202 // Additional tabs to open during first run. |
| 210 std::vector<GURL> first_run_tabs_; | 203 std::vector<GURL> first_run_tabs_; |
| 211 | 204 |
| 212 DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 205 DISALLOW_COPY_AND_ASSIGN(BrowserInit); |
| 213 }; | 206 }; |
| 214 | 207 |
| 215 #endif // CHROME_BROWSER_BROWSER_INIT_H_ | 208 #endif // CHROME_BROWSER_BROWSER_INIT_H_ |
| OLD | NEW |