summaryrefslogtreecommitdiffstats
path: root/mojo/examples/browser
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 04:11:39 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 04:11:39 +0000
commit2992d10e5d9b13cf4a275b6eb9f1fddc71c383f5 (patch)
tree7967d540b3b61f94396f7c9c5f7d340fe0ecbc49 /mojo/examples/browser
parent645c474490f7069300e935e5bc7fecca67049465 (diff)
downloadchromium_src-2992d10e5d9b13cf4a275b6eb9f1fddc71c383f5.zip
chromium_src-2992d10e5d9b13cf4a275b6eb9f1fddc71c383f5.tar.gz
chromium_src-2992d10e5d9b13cf4a275b6eb9f1fddc71c383f5.tar.bz2
Replace OnViewManagerConnectionEstablished and OnRootAdded with a single OnEmbed call
R=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/418223011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/browser')
-rw-r--r--mojo/examples/browser/browser.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/examples/browser/browser.cc b/mojo/examples/browser/browser.cc
index 719f8f2..fb2a308 100644
--- a/mojo/examples/browser/browser.cc
+++ b/mojo/examples/browser/browser.cc
@@ -203,8 +203,8 @@ class Browser : public ApplicationDelegate,
}
// ViewManagerDelegate:
- virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
- // TODO: deal with OnRootAdded() being invoked multiple times.
+ virtual void OnEmbed(ViewManager* view_manager, Node* root) OVERRIDE {
+ // TODO: deal with OnEmbed() being invoked multiple times.
view_manager_ = view_manager;
root_ = root;
root_->AddObserver(this);