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

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

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

Patch Set: Moved NavigationFeature to blimp/client/core/contents Created 4 years, 5 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/contents/fake_navigation_feature.h ('K') | « blimp/client/core/contents/mock_navigation_feature_delegate.cc ('k') | blimp/client/core/contents/navigation_feature.cc » ('j') | blimp/client/public/android/java/src/org/chromium/blimp_public/contents/BlimpContentsObserver.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

similarity index 82%

rename from blimp/client/feature/navigation_feature.h

rename to blimp/client/core/contents/navigation_feature.h

index c5dd226601592bb05823749ce1e61d3d99ab2917..73550b18acda78035eaebc695efbac03ad540b13 100644

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

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

@@ -2,8 +2,8 @@

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

// found in the LICENSE file.

-#ifndef BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_

-#define BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_

+#ifndef BLIMP_CLIENT_CORE_CONTENTS_NAVIGATION_FEATURE_H_

+#define BLIMP_CLIENT_CORE_CONTENTS_NAVIGATION_FEATURE_H_

#include <map>

#include <string>

@@ -48,18 +48,22 @@ 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.

Kevin M 2016/07/27 23:35:17 Capitalize Virtual

shaktisahu 2016/07/28 19:32:52 Done.

+ 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:

+ // Finds the NavigationFeatureDelegate for a |tab_id|, protected for unit

+ // tests.

NavigationFeatureDelegate* FindDelegate(const int tab_id);

+ private:

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

Kevin M 2016/07/27 23:35:17 IMO these private typedefs do more harm than good

shaktisahu 2016/07/28 19:32:52 Done.

DelegateMap delegates_;

@@ -73,4 +77,4 @@ class NavigationFeature : public BlimpMessageProcessor {

} // namespace client

} // namespace blimp

-#endif // BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_

+#endif // BLIMP_CLIENT_CORE_CONTENTS_NAVIGATION_FEATURE_H_