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

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

Issue 8937001: Fixes for the kWasRestarted pref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // implies that the directory of the executable should be used. 67 // implies that the directory of the executable should be used.
68 // |process_startup| indicates whether this is the first browser. 68 // |process_startup| indicates whether this is the first browser.
69 // |is_first_run| indicates that this is a new profile. 69 // |is_first_run| indicates that this is a new profile.
70 bool LaunchBrowser(const CommandLine& command_line, 70 bool LaunchBrowser(const CommandLine& command_line,
71 Profile* profile, 71 Profile* profile,
72 const FilePath& cur_dir, 72 const FilePath& cur_dir,
73 IsProcessStartup is_process_startup, 73 IsProcessStartup is_process_startup,
74 IsFirstRun is_first_run, 74 IsFirstRun is_first_run,
75 int* return_code); 75 int* return_code);
76 76
77 static bool was_restarted();
Finnur 2011/12/13 10:53:04 Document this one. Specifically, it should be made
marja 2011/12/13 11:09:10 Done.
78
77 // LaunchWithProfile --------------------------------------------------------- 79 // LaunchWithProfile ---------------------------------------------------------
78 // 80 //
79 // Assists launching the application and appending the initial tabs for a 81 // Assists launching the application and appending the initial tabs for a
80 // browser window. 82 // browser window.
81 83
82 class LaunchWithProfile { 84 class LaunchWithProfile {
83 public: 85 public:
84 // Used by OpenTabsInBrowser. 86 // Used by OpenTabsInBrowser.
85 struct Tab { 87 struct Tab {
86 Tab(); 88 Tab();
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 // Callback after a profile has been created. 245 // Callback after a profile has been created.
244 static void ProcessCommandLineOnProfileCreated( 246 static void ProcessCommandLineOnProfileCreated(
245 const CommandLine& cmd_line, 247 const CommandLine& cmd_line,
246 const FilePath& cur_dir, 248 const FilePath& cur_dir,
247 Profile* profile, 249 Profile* profile,
248 Profile::CreateStatus status); 250 Profile::CreateStatus status);
249 251
250 // Additional tabs to open during first run. 252 // Additional tabs to open during first run.
251 std::vector<GURL> first_run_tabs_; 253 std::vector<GURL> first_run_tabs_;
252 254
255 static bool was_restarted_read_;
Miranda Callahan 2011/12/13 10:59:16 could you add a comment here to explain the differ
marja 2011/12/13 11:09:10 Done.
256 static bool was_restarted_;
257
253 DISALLOW_COPY_AND_ASSIGN(BrowserInit); 258 DISALLOW_COPY_AND_ASSIGN(BrowserInit);
254 }; 259 };
255 260
256 #endif // CHROME_BROWSER_UI_BROWSER_INIT_H_ 261 #endif // CHROME_BROWSER_UI_BROWSER_INIT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698