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

Unified Diff: chrome/chrome_watcher/chrome_watcher_main.cc

Issue 2491463002: Revert of Windows install_static refactor. (Closed)
Patch Set: Created 4 years, 1 month 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/chrome_watcher/DEPS ('k') | chrome/chrome_watcher/chrome_watcher_main_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_watcher/chrome_watcher_main.cc
diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc
index 47efb29cc50b76225d0c43dcbe9970b6ff1db3eb..29f63af9d6b3fec4500d52d7793aa92bd50e1daf 100644
--- a/chrome/chrome_watcher/chrome_watcher_main.cc
+++ b/chrome/chrome_watcher/chrome_watcher_main.cc
@@ -33,9 +33,9 @@
#include "base/time/time.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
+
#include "chrome/chrome_watcher/chrome_watcher_main_api.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/install_static/install_details.h"
+#include "chrome/installer/util/util_constants.h"
#include "components/browser_watcher/endsession_watcher_window_win.h"
#include "components/browser_watcher/exit_code_watcher_win.h"
#include "components/browser_watcher/window_hang_monitor_win.h"
@@ -187,9 +187,8 @@
HANDLE process_handle,
DWORD main_thread_id,
HANDLE on_initialized_event_handle,
- const base::char16* browser_data_directory) {
- install_static::InstallDetails::InitializeFromPrimaryModule(
- chrome::kChromeElfDllName);
+ const base::char16* browser_data_directory,
+ const base::char16* channel_name) {
base::Process process(process_handle);
base::win::ScopedHandle on_initialized_event(on_initialized_event_handle);
« no previous file with comments | « chrome/chrome_watcher/DEPS ('k') | chrome/chrome_watcher/chrome_watcher_main_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698