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

Unified Diff: examples/browser/browser.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 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 | « examples/aura_demo/aura_demo.cc ('k') | examples/embedded_app/embedded_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/browser/browser.cc
diff --git a/examples/browser/browser.cc b/examples/browser/browser.cc
index bda43672812f50e11e454a27bc113da463e259be..bbe96adab5f11c751a54418af40ed26eac46f2ed 100644
--- a/examples/browser/browser.cc
+++ b/examples/browser/browser.cc
@@ -154,8 +154,7 @@ class Browser : public ApplicationDelegate,
public views::TextfieldController,
public ViewObserver {
public:
- Browser()
- : shell_(nullptr), view_manager_(NULL), root_(NULL), widget_(NULL) {}
+ Browser() : shell_(nullptr), root_(NULL), widget_(NULL) {}
virtual ~Browser() {
if (root_)
@@ -203,13 +202,11 @@ class Browser : public ApplicationDelegate,
}
// ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
+ virtual void OnEmbed(View* root,
ServiceProviderImpl* exported_services,
scoped_ptr<ServiceProvider> imported_services) override {
// TODO: deal with OnEmbed() being invoked multiple times.
ConnectToService(imported_services.get(), &navigator_host_);
- view_manager_ = view_manager;
root_ = root;
root_->AddObserver(this);
root_->SetFocus();
@@ -217,8 +214,6 @@ class Browser : public ApplicationDelegate,
}
virtual void OnViewManagerDisconnected(
ViewManager* view_manager) override {
- DCHECK_EQ(view_manager_, view_manager);
- view_manager_ = NULL;
base::MessageLoop::current()->Quit();
}
@@ -259,7 +254,6 @@ class Browser : public ApplicationDelegate,
scoped_ptr<ViewsInit> views_init_;
- ViewManager* view_manager_;
scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
View* root_;
views::Widget* widget_;
« no previous file with comments | « examples/aura_demo/aura_demo.cc ('k') | examples/embedded_app/embedded_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698