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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1423063004: Allow Chrome to bind an Application request from mojo_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@callback
Patch Set: . Created 5 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/browser/chrome_browser_main.h ('k') | chrome/browser/mojo_runner_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index cb3ca1d2cab8142ad59152d67246f39a1eb87ebe..5c049129c0cad8ea9a74bc07e61495a2f0954350 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -63,6 +63,7 @@
#include "chrome/browser/memory/tab_manager.h"
#include "chrome/browser/metrics/field_trial_synchronizer.h"
#include "chrome/browser/metrics/thread_watcher.h"
+#include "chrome/browser/mojo_runner_util.h"
#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
#include "chrome/browser/net/crl_set_fetcher.h"
#include "chrome/browser/performance_monitor/performance_monitor.h"
@@ -247,6 +248,10 @@
#include "components/webusb/webusb_detector.h"
#endif
+#if defined(MOJO_RUNNER_CLIENT)
+#include "chrome/browser/mojo_runner_state.h"
+#endif
+
using content::BrowserThread;
namespace {
@@ -1212,6 +1217,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
SCOPED_UMA_HISTOGRAM_LONG_TIMER("Startup.PreMainMessageLoopRunImplLongTime");
const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
+#if defined(MOJO_RUNNER_CLIENT)
+ if (IsRunningInMojoRunner()) {
+ mojo_runner_state_.reset(new MojoRunnerState);
+ mojo_runner_state_->WaitForConnection();
+ }
+#endif // defined(MOJO_RUNNER_CLIENT)
+
#if defined(OS_WIN)
// Windows parental controls calls can be slow, so we do an early init here
// that calculates this value off of the UI thread.
« no previous file with comments | « chrome/browser/chrome_browser_main.h ('k') | chrome/browser/mojo_runner_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698