blimp/client/feature/navigation_feature.h - Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: blimp/client/feature/navigation_feature.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 side-by-side diff with in-line comments

Download patch

« blimp/client/core/public/android/java/src/org/chromium/blimp/core_public/BlimpNavigationController.java ('K') | « blimp/client/feature/mock_navigation_feature.cc ('k') | tools/android/eclipse/.classpath » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/feature/navigation_feature.h

diff --git a/blimp/client/feature/navigation_feature.h b/blimp/client/feature/navigation_feature.h

index c5dd226601592bb05823749ce1e61d3d99ab2917..eded1068e8044c77dfa089fc526de37c79cc0187 100644

--- a/blimp/client/feature/navigation_feature.h

+++ b/blimp/client/feature/navigation_feature.h

@@ -48,18 +48,20 @@ class NavigationFeature : public BlimpMessageProcessor {

void SetDelegate(int tab_id, NavigationFeatureDelegate* delegate);

void RemoveDelegate(int tab_id);

- void NavigateToUrlText(int tab_id, const std::string& url_text);

- void Reload(int tab_id);

- void GoForward(int tab_id);

- void GoBack(int tab_id);

+ // virtual for testing.

+ virtual void NavigateToUrlText(int tab_id, const std::string& url_text);

+ virtual void Reload(int tab_id);

+ virtual void GoForward(int tab_id);

+ virtual void GoBack(int tab_id);

// BlimpMessageProcessor implementation.

void ProcessMessage(std::unique_ptr<BlimpMessage> message,

const net::CompletionCallback& callback) override;

- private:

+ protected:

NavigationFeatureDelegate* FindDelegate(const int tab_id);

David Trainor- moved to gerrit 2016/06/29 17:27:15 comment. explain whatitdoes and why it's protected

shaktisahu 2016/07/19 21:45:29 Done.

+ private:

typedef base::SmallMap<std::map<int, NavigationFeatureDelegate*>> DelegateMap;

DelegateMap delegates_;