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

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

Issue 1141453002: Makes browser resize content when root bounds change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to androidui 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"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 mojo::InterfaceRequest<mojo::ServiceProvider> services, 54 mojo::InterfaceRequest<mojo::ServiceProvider> services,
55 mojo::ServiceProviderPtr exposed_services) override; 55 mojo::ServiceProviderPtr exposed_services) override;
56 void OnAcceleratorPressed(mojo::View* view, 56 void OnAcceleratorPressed(mojo::View* view,
57 mojo::KeyboardCode keyboard_code, 57 mojo::KeyboardCode keyboard_code,
58 mojo::EventFlags flags) override; 58 mojo::EventFlags flags) override;
59 59
60 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>: 60 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>:
61 void Create(mojo::ApplicationConnection* connection, 61 void Create(mojo::ApplicationConnection* connection,
62 mojo::InterfaceRequest<mojo::NavigatorHost> request) override; 62 mojo::InterfaceRequest<mojo::NavigatorHost> request) override;
63 63
64 void LayoutContent();
65
66 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; 64 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
67 65
68 // Only support being embedded once, so both application-level 66 // Only support being embedded once, so both application-level
69 // and embedding-level state are shared on the same object. 67 // and embedding-level state are shared on the same object.
70 mojo::View* root_; 68 mojo::View* root_;
71 mojo::View* content_; 69 mojo::View* content_;
72 std::string default_url_; 70 std::string default_url_;
73 std::string pending_url_; 71 std::string pending_url_;
74 72
75 mojo::ServiceProviderImpl exposed_services_impl_; 73 mojo::ServiceProviderImpl exposed_services_impl_;
76 scoped_ptr<MergedServiceProvider> merged_service_provider_; 74 scoped_ptr<MergedServiceProvider> merged_service_provider_;
77 75
78 NavigatorHostImpl navigator_host_; 76 NavigatorHostImpl navigator_host_;
79 77
80 scoped_ptr<BrowserUI> ui_; 78 scoped_ptr<BrowserUI> ui_;
81 79
82 base::WeakPtrFactory<Browser> weak_factory_; 80 base::WeakPtrFactory<Browser> weak_factory_;
83 81
84 DISALLOW_COPY_AND_ASSIGN(Browser); 82 DISALLOW_COPY_AND_ASSIGN(Browser);
85 }; 83 };
86 84
87 } // namespace mandoline 85 } // namespace mandoline
88 86
89 #endif // MANDOLINE_UI_BROWSER_BROWSER_H_ 87 #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