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

Side by Side Diff: mandoline/ui/browser/browser.h

Issue 1136593004: Add a simple browser UI (with url bar) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 unified diff | Download patch
« no previous file with comments | « mandoline/ui/browser/android/android_ui.cc ('k') | mandoline/ui/browser/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MANDOLINE_UI_BROWSER_BROWSER_H_ 5 #ifndef MANDOLINE_UI_BROWSER_BROWSER_H_
6 #define MANDOLINE_UI_BROWSER_BROWSER_H_ 6 #define MANDOLINE_UI_BROWSER_BROWSER_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "components/view_manager/public/cpp/view_manager.h" 9 #include "components/view_manager/public/cpp/view_manager.h"
10 #include "components/view_manager/public/cpp/view_manager_delegate.h" 10 #include "components/view_manager/public/cpp/view_manager_delegate.h"
11 #include "components/view_manager/public/cpp/view_observer.h"
12 #include "components/window_manager/window_manager_app.h" 11 #include "components/window_manager/window_manager_app.h"
13 #include "components/window_manager/window_manager_delegate.h" 12 #include "components/window_manager/window_manager_delegate.h"
14 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" 13 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"
15 #include "mandoline/ui/browser/navigator_host_impl.h" 14 #include "mandoline/ui/browser/navigator_host_impl.h"
16 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h" 15 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"
17 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" 16 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
18 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" 17 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
19 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h" 18 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h"
20 #include "ui/mojo/events/input_events.mojom.h" 19 #include "ui/mojo/events/input_events.mojom.h"
21 20
22 namespace mandoline { 21 namespace mandoline {
23 22
23 class BrowserUI;
24 class MergedServiceProvider; 24 class MergedServiceProvider;
25 25
26 class Browser : public mojo::ApplicationDelegate, 26 class Browser : public mojo::ApplicationDelegate,
27 public mojo::ViewManagerDelegate, 27 public mojo::ViewManagerDelegate,
28 public mojo::ViewObserver,
29 public window_manager::WindowManagerDelegate, 28 public window_manager::WindowManagerDelegate,
30 public mojo::InterfaceFactory<mojo::NavigatorHost> { 29 public mojo::InterfaceFactory<mojo::NavigatorHost> {
31 public: 30 public:
32 Browser(); 31 Browser();
33 ~Browser() override; 32 ~Browser() override;
34 33
35 base::WeakPtr<Browser> GetWeakPtr(); 34 base::WeakPtr<Browser> GetWeakPtr();
36 35
37 void ReplaceContentWithURL(const mojo::String& url); 36 void ReplaceContentWithURL(const mojo::String& url);
38 37
39 private: 38 private:
40 // Overridden from mojo::ApplicationDelegate: 39 // Overridden from mojo::ApplicationDelegate:
41 void Initialize(mojo::ApplicationImpl* app) override; 40 void Initialize(mojo::ApplicationImpl* app) override;
42 bool ConfigureIncomingConnection( 41 bool ConfigureIncomingConnection(
43 mojo::ApplicationConnection* connection) override; 42 mojo::ApplicationConnection* connection) override;
44 bool ConfigureOutgoingConnection( 43 bool ConfigureOutgoingConnection(
45 mojo::ApplicationConnection* connection) override; 44 mojo::ApplicationConnection* connection) override;
46 45
47 // Overridden from mojo::ViewManagerDelegate: 46 // Overridden from mojo::ViewManagerDelegate:
48 void OnEmbed(mojo::View* root, 47 void OnEmbed(mojo::View* root,
49 mojo::InterfaceRequest<mojo::ServiceProvider> services, 48 mojo::InterfaceRequest<mojo::ServiceProvider> services,
50 mojo::ServiceProviderPtr exposed_services) override; 49 mojo::ServiceProviderPtr exposed_services) override;
51 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; 50 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
52 51
53 // Overriden from mojo::ViewObserver:
54 void OnViewDestroyed(mojo::View* view) override;
55 void OnViewBoundsChanged(mojo::View* view,
56 const mojo::Rect& old_bounds,
57 const mojo::Rect& new_bounds) override;
58
59 // Overridden from WindowManagerDelegate: 52 // Overridden from WindowManagerDelegate:
60 void Embed(const mojo::String& url, 53 void Embed(const mojo::String& url,
61 mojo::InterfaceRequest<mojo::ServiceProvider> services, 54 mojo::InterfaceRequest<mojo::ServiceProvider> services,
62 mojo::ServiceProviderPtr exposed_services) override; 55 mojo::ServiceProviderPtr exposed_services) override;
63 void OnAcceleratorPressed(mojo::View* view, 56 void OnAcceleratorPressed(mojo::View* view,
64 mojo::KeyboardCode keyboard_code, 57 mojo::KeyboardCode keyboard_code,
65 mojo::EventFlags flags) override; 58 mojo::EventFlags flags) override;
66 59
67 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>: 60 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>:
68 void Create(mojo::ApplicationConnection* connection, 61 void Create(mojo::ApplicationConnection* connection,
69 mojo::InterfaceRequest<mojo::NavigatorHost> request) override; 62 mojo::InterfaceRequest<mojo::NavigatorHost> request) override;
70 63
64 void LayoutContent();
65
71 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; 66 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
72 67
73 // Only support being embedded once, so both application-level 68 // Only support being embedded once, so both application-level
74 // and embedding-level state are shared on the same object. 69 // and embedding-level state are shared on the same object.
75 mojo::View* root_; 70 mojo::View* root_;
76 mojo::View* content_; 71 mojo::View* content_;
77 std::string default_url_; 72 std::string default_url_;
78 std::string pending_url_; 73 std::string pending_url_;
79 74
80 mojo::ServiceProviderImpl exposed_services_impl_; 75 mojo::ServiceProviderImpl exposed_services_impl_;
81 scoped_ptr<MergedServiceProvider> merged_service_provider_; 76 scoped_ptr<MergedServiceProvider> merged_service_provider_;
82 77
83 NavigatorHostImpl navigator_host_; 78 NavigatorHostImpl navigator_host_;
84 79
80 scoped_ptr<BrowserUI> ui_;
81
85 base::WeakPtrFactory<Browser> weak_factory_; 82 base::WeakPtrFactory<Browser> weak_factory_;
86 83
87 DISALLOW_COPY_AND_ASSIGN(Browser); 84 DISALLOW_COPY_AND_ASSIGN(Browser);
88 }; 85 };
89 86
90 } // namespace mandoline 87 } // namespace mandoline
91 88
92 #endif // MANDOLINE_UI_BROWSER_BROWSER_H_ 89 #endif // MANDOLINE_UI_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « mandoline/ui/browser/android/android_ui.cc ('k') | mandoline/ui/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698