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

Side by Side Diff: mandoline/ui/omnibox/omnibox_impl.h

Issue 1166123005: Removes ServiceProviders from ViewManager::Embed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use is_headless rather than check for browser. Created 5 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 unified diff | Download patch
« no previous file with comments | « mandoline/ui/browser/view_embedder.mojom ('k') | mandoline/ui/omnibox/omnibox_impl.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_OMNIBOX_OMNIBOX_IMPL_H_ 5 #ifndef MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_
6 #define MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_ 6 #define MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_
7 7
8 #include "components/view_manager/public/cpp/view_manager_delegate.h" 8 #include "components/view_manager/public/cpp/view_manager_delegate.h"
9 #include "mandoline/ui/browser/omnibox.mojom.h" 9 #include "mandoline/ui/browser/omnibox.mojom.h"
10 #include "mandoline/ui/browser/view_embedder.mojom.h" 10 #include "mandoline/ui/browser/view_embedder.mojom.h"
(...skipping 23 matching lines...) Expand all
34 34
35 private: 35 private:
36 // Overridden from mojo::ApplicationDelegate: 36 // Overridden from mojo::ApplicationDelegate:
37 void Initialize(mojo::ApplicationImpl* app) override; 37 void Initialize(mojo::ApplicationImpl* app) override;
38 bool ConfigureIncomingConnection( 38 bool ConfigureIncomingConnection(
39 mojo::ApplicationConnection* connection) override; 39 mojo::ApplicationConnection* connection) override;
40 bool ConfigureOutgoingConnection( 40 bool ConfigureOutgoingConnection(
41 mojo::ApplicationConnection* connection) override; 41 mojo::ApplicationConnection* connection) override;
42 42
43 // Overridden from mojo::ViewManagerDelegate: 43 // Overridden from mojo::ViewManagerDelegate:
44 void OnEmbed(mojo::View* root, 44 void OnEmbed(mojo::View* root) override;
45 mojo::InterfaceRequest<mojo::ServiceProvider> services,
46 mojo::ServiceProviderPtr exposed_services) override;
47 void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override; 45 void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override;
48 46
49 // Overridden from views::LayoutManager: 47 // Overridden from views::LayoutManager:
50 gfx::Size GetPreferredSize(const views::View* view) const override; 48 gfx::Size GetPreferredSize(const views::View* view) const override;
51 void Layout(views::View* host) override; 49 void Layout(views::View* host) override;
52 50
53 // Overridden from views::TextfieldController: 51 // Overridden from views::TextfieldController:
54 bool HandleKeyEvent(views::Textfield* sender, 52 bool HandleKeyEvent(views::Textfield* sender,
55 const ui::KeyEvent& key_event) override; 53 const ui::KeyEvent& key_event) override;
56 54
(...skipping 13 matching lines...) Expand all
70 mojo::WeakBindingSet<Omnibox> bindings_; 68 mojo::WeakBindingSet<Omnibox> bindings_;
71 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; 69 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
72 ViewEmbedderPtr view_embedder_; 70 ViewEmbedderPtr view_embedder_;
73 71
74 DISALLOW_COPY_AND_ASSIGN(OmniboxImpl); 72 DISALLOW_COPY_AND_ASSIGN(OmniboxImpl);
75 }; 73 };
76 74
77 } // namespace mandoline 75 } // namespace mandoline
78 76
79 #endif // MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_ 77 #endif // MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_
OLDNEW
« no previous file with comments | « mandoline/ui/browser/view_embedder.mojom ('k') | mandoline/ui/omnibox/omnibox_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698