blimp/client/core/contents/blimp_contents_impl.h - Issue 2201433002: Migrate TabControlFeature from 0.5 to 0.6

Unified Diff: blimp/client/core/contents/blimp_contents_impl.h

Issue 2201433002: Migrate TabControlFeature from 0.5 to 0.6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git add blimp/client/public/contents/blimp_contents_observer.cc Created 4 years, 4 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:

Index: blimp/client/core/contents/blimp_contents_impl.h

diff --git a/blimp/client/core/contents/blimp_contents_impl.h b/blimp/client/core/contents/blimp_contents_impl.h

index 38c457b8ba7b2710d34ae0aaa124db04728020f0..6419c7e557b1cc9cd0cfbec512b66aa72694eace 100644

--- a/blimp/client/core/contents/blimp_contents_impl.h

+++ b/blimp/client/core/contents/blimp_contents_impl.h

@@ -29,7 +29,7 @@ class BlimpNavigationController;

class BlimpContentsImpl : public BlimpContents,

public BlimpNavigationControllerDelegate {

public:

- BlimpContentsImpl();

+ explicit BlimpContentsImpl(int id);

~BlimpContentsImpl() override;

#if defined(OS_ANDROID)

@@ -45,6 +45,8 @@ class BlimpContentsImpl : public BlimpContents,

// BlimpNavigationControllerDelegate implementation.

void OnNavigationStateChanged() override;

+ int id() { return id_; }

private:

// Handles the back/forward list and loading URLs.

BlimpNavigationControllerImpl navigation_controller_;

@@ -52,7 +54,9 @@ class BlimpContentsImpl : public BlimpContents,

// A list of all the observers of this BlimpContentsImpl.

base::ObserverList<BlimpContentsObserver> observers_;

- DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);

+ int id_;

nyquist 2016/08/05 23:03:22 Could you explain what this ID is for?

Menglin 2016/08/05 23:37:15 yeah, when a BlimpContentsImpl is destroyed, its B

Menglin 2016/08/06 00:57:00 comments added

+ DISALLOW_IMPLICIT_CONSTRUCTORS(BlimpContentsImpl);

nyquist 2016/08/05 23:03:23 Is there a reason we can't DISALLOW_COPY_AND_ASSIG

Menglin 2016/08/05 23:37:15 since I removed BlimpContentsImpl(), and I had a c

Menglin 2016/08/06 00:57:00 Sorry i double checked. there is no problem using

};

} // namespace client