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

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

Issue 1135933003: Get the omnibox to show up again. Sky's changes from yesterday removed the window manager interface… (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/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 "mojo/application/public/cpp/application_delegate.h" 11 #include "mojo/application/public/cpp/application_delegate.h"
11 #include "mojo/application/public/cpp/interface_factory.h" 12 #include "mojo/application/public/cpp/interface_factory.h"
12 #include "mojo/common/weak_binding_set.h" 13 #include "mojo/common/weak_binding_set.h"
13 #include "ui/views/controls/textfield/textfield_controller.h" 14 #include "ui/views/controls/textfield/textfield_controller.h"
14 #include "ui/views/layout/layout_manager.h" 15 #include "ui/views/layout/layout_manager.h"
15 16
16 namespace mojo { 17 namespace mojo {
17 class ViewManagerClientFactory; 18 class ViewManagerClientFactory;
18 } 19 }
19 20
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void SetClient(OmniboxClientPtr client) override; 62 void SetClient(OmniboxClientPtr client) override;
62 void ShowForURL(const mojo::String& url) override; 63 void ShowForURL(const mojo::String& url) override;
63 64
64 OmniboxClientPtr client_; 65 OmniboxClientPtr client_;
65 scoped_ptr<AuraInit> aura_init_; 66 scoped_ptr<AuraInit> aura_init_;
66 mojo::ApplicationImpl* app_impl_; 67 mojo::ApplicationImpl* app_impl_;
67 mojo::String url_; 68 mojo::String url_;
68 views::Textfield* edit_; 69 views::Textfield* edit_;
69 mojo::WeakBindingSet<Omnibox> bindings_; 70 mojo::WeakBindingSet<Omnibox> bindings_;
70 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; 71 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
72 ViewEmbedderPtr view_embedder_;
71 73
72 DISALLOW_COPY_AND_ASSIGN(OmniboxImpl); 74 DISALLOW_COPY_AND_ASSIGN(OmniboxImpl);
73 }; 75 };
74 76
75 } // namespace mandoline 77 } // namespace mandoline
76 78
77 #endif // MANDOLINE_UI_OMNIBOX_OMNIBOX_IMPL_H_ 79 #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