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

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

Issue 1254383016: ApplicationConnection lifetime management changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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/browser_apptest.cc ('k') | mandoline/ui/browser/desktop/desktop_ui.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_DESKTOP_DESKTOP_UI_H_ 5 #ifndef MANDOLINE_UI_BROWSER_DESKTOP_DESKTOP_UI_H_
6 #define MANDOLINE_UI_BROWSER_DESKTOP_DESKTOP_UI_H_ 6 #define MANDOLINE_UI_BROWSER_DESKTOP_DESKTOP_UI_H_
7 7
8 #include "mandoline/ui/browser/browser_ui.h" 8 #include "mandoline/ui/browser/browser_ui.h"
9 #include "mandoline/ui/browser/public/interfaces/omnibox.mojom.h" 9 #include "mandoline/ui/browser/public/interfaces/omnibox.mojom.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
11 #include "ui/views/layout/layout_manager.h" 11 #include "ui/views/layout/layout_manager.h"
12 12
13 namespace mojo { 13 namespace mojo {
14 class ApplicationConnection;
14 class Shell; 15 class Shell;
15 class View; 16 class View;
16 } 17 }
17 18
18 namespace views { 19 namespace views {
19 class LabelButton; 20 class LabelButton;
20 } 21 }
21 22
22 namespace mandoline { 23 namespace mandoline {
23 24
(...skipping 22 matching lines...) Expand all
46 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 47 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
47 48
48 Browser* browser_; 49 Browser* browser_;
49 mojo::ApplicationImpl* application_impl_; 50 mojo::ApplicationImpl* application_impl_;
50 views::LabelButton* omnibox_launcher_; 51 views::LabelButton* omnibox_launcher_;
51 ProgressView* progress_bar_; 52 ProgressView* progress_bar_;
52 mojo::View* root_; 53 mojo::View* root_;
53 mojo::View* content_; 54 mojo::View* content_;
54 OmniboxPtr omnibox_; 55 OmniboxPtr omnibox_;
55 mojo::Binding<OmniboxClient> client_binding_; 56 mojo::Binding<OmniboxClient> client_binding_;
57 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_;
56 58
57 DISALLOW_COPY_AND_ASSIGN(DesktopUI); 59 DISALLOW_COPY_AND_ASSIGN(DesktopUI);
58 }; 60 };
59 61
60 } // namespace mandoline 62 } // namespace mandoline
61 63
62 #endif // MANDOLINE_UI_BROWSER_DESKTOP_DESKTOP_UI_H_ 64 #endif // MANDOLINE_UI_BROWSER_DESKTOP_DESKTOP_UI_H_
OLDNEW
« no previous file with comments | « mandoline/ui/browser/browser_apptest.cc ('k') | mandoline/ui/browser/desktop/desktop_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698