Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Side by Side Diff: chrome/browser/browser_init.h

Issue 2878056: Put back 53641 - Landing OEM customization CL for Denis... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/browser_init.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // Launches a browser window associated with |profile|. |command_line| 71 // Launches a browser window associated with |profile|. |command_line|
72 // should be the command line passed to this process. |cur_dir| can be 72 // should be the command line passed to this process. |cur_dir| can be
73 // the null string, which implies that the directory of the executable. 73 // the null string, which implies that the directory of the executable.
74 // should be used. |process_startup| indicates whether this is the 74 // should be used. |process_startup| indicates whether this is the
75 // first browser. 75 // first browser.
76 bool LaunchBrowser(const CommandLine& command_line, Profile* profile, 76 bool LaunchBrowser(const CommandLine& command_line, Profile* profile,
77 const std::wstring& cur_dir, bool process_startup, 77 const std::wstring& cur_dir, bool process_startup,
78 int* return_code); 78 int* return_code);
79 79
80 #if defined(OS_CHROMEOS)
81 // Processes the OEM services customization document and modifies browser
82 // settings like initial startup page, web apps and extentions.
83 bool ApplyServicesCustomization(
84 const chromeos::ServicesCustomizationDocument* customization);
85 #endif
86
87 // LaunchWithProfile --------------------------------------------------------- 80 // LaunchWithProfile ---------------------------------------------------------
88 // 81 //
89 // Assists launching the application and appending the initial tabs for a 82 // Assists launching the application and appending the initial tabs for a
90 // browser window. 83 // browser window.
91 84
92 class LaunchWithProfile { 85 class LaunchWithProfile {
93 public: 86 public:
94 // Used by OpenTabsInBrowser. 87 // Used by OpenTabsInBrowser.
95 struct Tab { 88 struct Tab {
96 Tab() : is_app(false), is_pinned(true) {} 89 Tab() : is_app(false), is_pinned(true) {}
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool process_startup, Profile* profile, 200 bool process_startup, Profile* profile,
208 int* return_code, BrowserInit* browser_init); 201 int* return_code, BrowserInit* browser_init);
209 202
210 // Additional tabs to open during first run. 203 // Additional tabs to open during first run.
211 std::vector<GURL> first_run_tabs_; 204 std::vector<GURL> first_run_tabs_;
212 205
213 DISALLOW_COPY_AND_ASSIGN(BrowserInit); 206 DISALLOW_COPY_AND_ASSIGN(BrowserInit);
214 }; 207 };
215 208
216 #endif // CHROME_BROWSER_BROWSER_INIT_H_ 209 #endif // CHROME_BROWSER_BROWSER_INIT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698