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

Side by Side Diff: mandoline/ui/desktop_ui/browser_window.h

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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/desktop_ui/browser_manager.cc ('k') | mandoline/ui/desktop_ui/browser_window.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_DESKTOP_UI_BROWSER_WINDOW_H_ 5 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ 6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
7 7
8 #include "components/view_manager/public/cpp/view_tree_connection.h" 8 #include "components/mus/public/cpp/view_tree_connection.h"
9 #include "components/view_manager/public/cpp/view_tree_delegate.h" 9 #include "components/mus/public/cpp/view_tree_delegate.h"
10 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h" 10 #include "components/mus/public/interfaces/view_tree_host.mojom.h"
11 #include "components/web_view/public/cpp/web_view.h" 11 #include "components/web_view/public/cpp/web_view.h"
12 #include "components/web_view/public/interfaces/web_view.mojom.h" 12 #include "components/web_view/public/interfaces/web_view.mojom.h"
13 #include "mandoline/ui/aura/aura_init.h" 13 #include "mandoline/ui/aura/aura_init.h"
14 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h" 14 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
15 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h" 15 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
16 #include "mojo/application/public/cpp/interface_factory.h" 16 #include "mojo/application/public/cpp/interface_factory.h"
17 #include "mojo/common/weak_binding_set.h" 17 #include "mojo/common/weak_binding_set.h"
18 #include "ui/views/controls/button/button.h" 18 #include "ui/views/controls/button/button.h"
19 #include "ui/views/layout/layout_manager.h" 19 #include "ui/views/layout/layout_manager.h"
20 #include "url/gurl.h" 20 #include "url/gurl.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 OmniboxPtr omnibox_; 107 OmniboxPtr omnibox_;
108 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_; 108 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(BrowserWindow); 110 DISALLOW_COPY_AND_ASSIGN(BrowserWindow);
111 }; 111 };
112 112
113 } // namespace mandoline 113 } // namespace mandoline
114 114
115 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ 115 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
OLDNEW
« no previous file with comments | « mandoline/ui/desktop_ui/browser_manager.cc ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698