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

Unified Diff: mash/browser/browser.cc

Issue 2179023004: Make Service own ServiceContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/browser/browser.h ('k') | mash/catalog_viewer/catalog_viewer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/browser/browser.cc
diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc
index bd0e57854d971b93cdb935a60eddf4b580e7c364..d58fef1eac2c3c26efeddd0e149377f591f23f2c 100644
--- a/mash/browser/browser.cc
+++ b/mash/browser/browser.cc
@@ -861,19 +861,17 @@ void Browser::RemoveWindow(views::Widget* window) {
std::unique_ptr<navigation::View> Browser::CreateView() {
navigation::mojom::ViewFactoryPtr factory;
- connector_->ConnectToInterface("exe:navigation", &factory);
+ connector()->ConnectToInterface("exe:navigation", &factory);
return base::WrapUnique(new navigation::View(std::move(factory)));
}
-void Browser::OnStart(shell::Connector* connector,
- const shell::Identity& identity,
- uint32_t id) {
- connector_ = connector;
- tracing_.Initialize(connector, identity.name());
+void Browser::OnStart(const shell::Identity& identity) {
+ tracing_.Initialize(connector(), identity.name());
- aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+ aura_init_.reset(
+ new views::AuraInit(connector(), "views_mus_resources.pak"));
window_manager_connection_ =
- views::WindowManagerConnection::Create(connector, identity);
+ views::WindowManagerConnection::Create(connector(), identity);
}
bool Browser::OnConnect(shell::Connection* connection) {
« no previous file with comments | « mash/browser/browser.h ('k') | mash/catalog_viewer/catalog_viewer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698