Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: services/navigation/view_impl.h

Issue 1981623002: Add a basic browser to mash that uses the navigation service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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
« no previous file with comments | « services/navigation/public/interfaces/view.mojom ('k') | services/navigation/view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/navigation/view_impl.h
diff --git a/services/navigation/view_impl.h b/services/navigation/view_impl.h
index e28281326ceaaa01fa6fceba54da4d1a5479a617..426185f7c9c9bad71a407478a5556da597c68af8 100644
--- a/services/navigation/view_impl.h
+++ b/services/navigation/view_impl.h
@@ -6,6 +6,7 @@
#define SERVICES_NAVIGATION_VIEW_IMPL_H_
#include "base/macros.h"
+#include "components/mus/public/cpp/window_tree_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
@@ -13,13 +14,22 @@
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_connection_ref.h"
+#include "ui/views/widget/widget_delegate.h"
+
+namespace views {
+class WebView;
+class Widget;
+}
namespace navigation {
class ViewImpl : public mojom::View,
- public content::WebContentsDelegate {
+ public content::WebContentsDelegate,
+ public mus::WindowTreeDelegate,
+ public views::WidgetDelegate {
public:
- ViewImpl(content::BrowserContext* browser_context,
+ ViewImpl(shell::Connector* connector,
+ content::BrowserContext* browser_context,
mojom::ViewClientPtr client,
mojom::ViewRequest request,
std::unique_ptr<shell::ShellConnectionRef> ref);
@@ -27,18 +37,50 @@ class ViewImpl : public mojom::View,
private:
// mojom::View:
- void LoadUrl(const GURL& url) override;
+ void NavigateTo(const GURL& url) override;
+ void GoBack() override;
+ void GoForward() override;
+ void Reload(bool skip_cache) override;
+ void Stop() override;
+ void GetWindowTreeClient(
+ mus::mojom::WindowTreeClientRequest request) override;
// content::WebContentsDelegate:
+ void AddNewContents(content::WebContents* source,
+ content::WebContents* new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_rect,
+ bool user_gesture,
+ bool* was_blocked) override;
+ void CloseContents(content::WebContents* source) override;
void LoadingStateChanged(content::WebContents* source,
bool to_different_document) override;
+ void NavigationStateChanged(content::WebContents* source,
+ content::InvalidateTypes changed_flags) override;
+ void LoadProgressChanged(content::WebContents* source,
+ double progress) override;
+
+ // mus::WindowTreeDelegate:
+ void OnEmbed(mus::Window* root) override;
+ void OnConnectionLost(mus::WindowTreeConnection* connection) override;
+ void OnEventObserved(const ui::Event& event, mus::Window* target) override;
+
+ // views::WidgetDelegate:
+ views::View* GetContentsView() override;
+ views::Widget* GetWidget() override;
+ const views::Widget* GetWidget() const override;
+ shell::Connector* connector_;
mojo::StrongBinding<mojom::View> binding_;
mojom::ViewClientPtr client_;
std::unique_ptr<shell::ShellConnectionRef> ref_;
+ views::WebView* web_view_;
+
std::unique_ptr<content::WebContents> web_contents_;
+ std::unique_ptr<views::Widget> widget_;
+
DISALLOW_COPY_AND_ASSIGN(ViewImpl);
};
« no previous file with comments | « services/navigation/public/interfaces/view.mojom ('k') | services/navigation/view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698