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

Unified Diff: chrome/browser/ui/browser_init.h

Issue 8854001: Honor profile directory when creating new window in existing browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/process_singleton_win.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init.h
diff --git a/chrome/browser/ui/browser_init.h b/chrome/browser/ui/browser_init.h
index 46ae72faafdf9d2c64983fd38ce5b10908daa59f..30314739ad203aafb145d1502a0b68b97cc7b56b 100644
--- a/chrome/browser/ui/browser_init.h
+++ b/chrome/browser/ui/browser_init.h
@@ -12,12 +12,12 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/gtest_prod_util.h"
+#include "chrome/browser/profiles/profile.h"
#include "googleurl/src/gurl.h"
class Browser;
class CommandLine;
class GURL;
-class Profile;
class TabContentsWrapper;
// class containing helpers for BrowserMain to spin up a new instance and
@@ -48,18 +48,11 @@ class BrowserInit {
this);
}
- // This function performs command-line handling and is invoked when process
- // starts as well as when we get a start request from another process (via the
- // WM_COPYDATA message). |command_line| holds the command line we need to
- // process - either from this process or from some other one (if
- // |process_startup| is true and we are being called from
- // ProcessSingleton::OnCopyData).
- static bool ProcessCommandLine(const CommandLine& cmd_line,
- const FilePath& cur_dir, bool process_startup,
- Profile* profile, int* return_code) {
- return ProcessCmdLineImpl(cmd_line, cur_dir, process_startup, profile,
- return_code, NULL);
- }
+ // This function performs command-line handling and is invoked only after
+ // start up (for example when we get a start request for another process).
+ // |command_line| holds the command line we need to process
+ static void ProcessCommandLineAlreadyRunning(const CommandLine& cmd_line,
+ const FilePath& cur_dir);
template <class AutomationProviderClass>
static bool CreateAutomationProvider(const std::string& channel_id,
@@ -247,6 +240,13 @@ class BrowserInit {
Profile* profile, int* return_code,
BrowserInit* browser_init);
+ // Callback after a profile has been created.
+ static void ProcessCommandLineOnProfileCreated(
+ const CommandLine& cmd_line,
+ const FilePath& cur_dir,
+ Profile* profile,
+ Profile::CreateStatus status);
+
// Additional tabs to open during first run.
std::vector<GURL> first_run_tabs_;
« no previous file with comments | « chrome/browser/process_singleton_win.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698