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

Side by Side Diff: chrome/app/chrome_exe_main_win.cc

Issue 14617003: Make chrome.exe rendezvous with existing chrome process earlier. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments / rebase Created 7 years, 7 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
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 #include <windows.h> 5 #include <windows.h>
6 #include <tchar.h> 6 #include <tchar.h>
7 7
8 #include <algorithm>
9 #include <string>
10
8 #include "base/at_exit.h" 11 #include "base/at_exit.h"
9 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_path.h"
10 #include "chrome/app/breakpad_win.h" 14 #include "chrome/app/breakpad_win.h"
11 #include "chrome/app/client_util.h" 15 #include "chrome/app/client_util.h"
12 #include "chrome/app/metro_driver_win.h" 16 #include "chrome/app/metro_driver_win.h"
17 #include "chrome/browser/chrome_process_finder_win.h"
18 #include "chrome/browser/policy/policy_path_parser.h"
19 #include "chrome/common/chrome_paths_internal.h"
20 #include "chrome/common/chrome_switches.h"
13 #include "content/public/app/startup_helper_win.h" 21 #include "content/public/app/startup_helper_win.h"
14 #include "content/public/common/result_codes.h" 22 #include "content/public/common/result_codes.h"
15 #include "sandbox/win/src/sandbox_factory.h" 23 #include "sandbox/win/src/sandbox_factory.h"
16 24
25 namespace {
26
17 int RunChrome(HINSTANCE instance) { 27 int RunChrome(HINSTANCE instance) {
18 bool exit_now = true; 28 bool exit_now = true;
19 // We restarted because of a previous crash. Ask user if we should relaunch. 29 // We restarted because of a previous crash. Ask user if we should relaunch.
20 if (ShowRestartDialogIfCrashed(&exit_now)) { 30 if (ShowRestartDialogIfCrashed(&exit_now)) {
21 if (exit_now) 31 if (exit_now)
22 return content::RESULT_CODE_NORMAL_EXIT; 32 return content::RESULT_CODE_NORMAL_EXIT;
23 } 33 }
24 34
25 // Initialize the sandbox services. 35 // Initialize the sandbox services.
26 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 36 sandbox::SandboxInterfaceInfo sandbox_info = {0};
27 content::InitializeSandboxInfo(&sandbox_info); 37 content::InitializeSandboxInfo(&sandbox_info);
28 38
29 // Load and launch the chrome dll. *Everything* happens inside. 39 // Load and launch the chrome dll. *Everything* happens inside.
30 MainDllLoader* loader = MakeMainDllLoader(); 40 MainDllLoader* loader = MakeMainDllLoader();
31 int rc = loader->Launch(instance, &sandbox_info); 41 int rc = loader->Launch(instance, &sandbox_info);
32 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded(); 42 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded();
33 delete loader; 43 delete loader;
34 return rc; 44 return rc;
35 } 45 }
36 46
47
48 bool IsFastStartSwitch(const std::string& command_line_switch) {
49 // List of switches that it's safe to rendezvous early with. Fast start should
50 // not be done if a command line contains a switch not in this set.
51 static const char* kFastStartSwitches[] = {
grt (UTC plus 2) 2013/05/13 13:32:07 Use the extra const to keep the whole structure in
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
52 switches::kProfileDirectory,
53 switches::kShowAppList,
54 };
55 for (size_t i = 0; i < arraysize(kFastStartSwitches); ++i)
gab 2013/05/13 13:27:43 nit: wrap for loop in {} since content is multiple
grt (UTC plus 2) 2013/05/13 13:32:07 braces on the "for" loop
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
56 if (command_line_switch == kFastStartSwitches[i])
57 return true;
58 return false;
59 }
60
61 bool ContainsNonFastStartFlag(CommandLine* command_line) {
gab 2013/05/13 13:27:43 This algorithm is O(m*n), where: m is the number o
koz (OOO until 15th September) 2013/05/14 08:39:54 I added the comment and the size check.
62 const CommandLine::SwitchMap& switches = command_line->GetSwitches();
gab 2013/05/13 13:27:43 Hmmm... GetSwitches is confusing, it says "// Get
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
63 for (CommandLine::SwitchMap::const_iterator it = switches.begin();
64 it != switches.end(); it++) {
gab 2013/05/13 13:27:43 nit: ++it
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
65 if (!IsFastStartSwitch(it->first))
66 return true;
67 }
68 return false;
69 }
70
71 bool AttemptFastNotify(CommandLine* command_line) {
72 if (ContainsNonFastStartFlag(command_line))
73 return false;
74
75 base::FilePath user_data_dir;
76 if (!chrome::GetDefaultUserDataDirectory(&user_data_dir))
77 return false;
78 policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
79
80 HWND chrome = chrome::FindRunningChromeWindow(user_data_dir);
81 return chrome && chrome::AttemptToNotifyRunningChrome(chrome);
82 }
83
84 } // namespace
85
37 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) { 86 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) {
38 // Initialize the commandline singleton from the environment. 87 // Initialize the commandline singleton from the environment.
39 CommandLine::Init(0, NULL); 88 CommandLine::Init(0, NULL);
40 // The exit manager is in charge of calling the dtors of singletons. 89 // The exit manager is in charge of calling the dtors of singletons.
41 base::AtExitManager exit_manager; 90 base::AtExitManager exit_manager;
42 91
92 if (AttemptFastNotify(CommandLine::ForCurrentProcess()))
93 return 0;
94
43 MetroDriver metro_driver; 95 MetroDriver metro_driver;
44 if (metro_driver.in_metro_mode()) 96 if (metro_driver.in_metro_mode())
45 return metro_driver.RunInMetro(instance, &RunChrome); 97 return metro_driver.RunInMetro(instance, &RunChrome);
46 // Not in metro mode, proceed as normal. 98 // Not in metro mode, proceed as normal.
47 return RunChrome(instance); 99 return RunChrome(instance);
48 } 100 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_process_finder_win.h » ('j') | chrome/browser/chrome_process_finder_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698