blimp/client/core/blimp_contents_impl.h - Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature

Side by Side Diff: blimp/client/core/blimp_contents_impl.h

Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_core

Patch Set: Hooked up the Java layer Created 4 years, 6 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 unified diff | Download patch

« no previous file with comments | « blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.java ('k') | blimp/client/core/blimp_contents_impl.cc » ('j') | blimp/client/core/blimp_contents_impl_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_	5 #ifndef BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_

6 #define BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_	6 #define BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/observer_list.h"	9 #include "base/observer_list.h"

10 #include "base/supports_user_data.h"	10 #include "base/supports_user_data.h"

(...skipping 29 matching lines...) Expand all Loading...
40 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();	40 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();

41 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();	41 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();

42 #endif // defined(OS_ANDROID)	42 #endif // defined(OS_ANDROID)

43	43

44 // BlimpContents implementation.	44 // BlimpContents implementation.

45 BlimpNavigationControllerImpl& GetNavigationController() override;	45 BlimpNavigationControllerImpl& GetNavigationController() override;

46 void AddObserver(BlimpContentsObserver* observer) override;	46 void AddObserver(BlimpContentsObserver* observer) override;

47 void RemoveObserver(BlimpContentsObserver* observer) override;	47 void RemoveObserver(BlimpContentsObserver* observer) override;

48	48

49 // BlimpNavigationControllerDelegate implementation.	49 // BlimpNavigationControllerDelegate implementation.

50 void NotifyURLLoaded(const GURL& url) override;	50 void OnUrlChanged(const GURL& url) override;
	David Trainor- moved to gerrit 2016/06/29 17:27:15 How are these generally exposed through the normal How are these generally exposed through the normal NavigationController flow? Does it make sense for us to have our delegate and feature have the same general API? shaktisahu 2016/07/19 21:45:29 Changed it to OnNavigationStateChanged as we discu Show quoted text On 2016/06/29 17:27:15, David Trainor wrote: > How are these generally exposed through the normal NavigationController flow? > Does it make sense for us to have our delegate and feature have the same general > API? Changed it to OnNavigationStateChanged as we discussed. May be we shuold remove these calls from NavigationFeature too and send an enum and the required params later.
	51 void OnFaviconChanged(const SkBitmap& favicon) override;

	52 void OnTitleChanged(const std::string& title) override;

	53 void OnLoadingChanged(bool loading) override;

	54 void OnPageLoadStatusUpdate(bool completed) override;

51	55

52 private:	56 private:

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

54 BlimpNavigationControllerImpl navigation_controller_;	58 BlimpNavigationControllerImpl navigation_controller_;

55	59

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

57 base::ObserverList<BlimpContentsObserver> observers_;	61 base::ObserverList<BlimpContentsObserver> observers_;

58	62

59 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);	63 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);

60 };	64 };

61	65

62 } // namespace client	66 } // namespace client

63 } // namespace blimp	67 } // namespace blimp

64	68

65 #endif // BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_	69 #endif // BLIMP_CLIENT_CORE_BLIMP_CONTENTS_IMPL_H_

OLD	NEW