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

Side by Side Diff: mandoline/ui/desktop_ui/browser_apptest.cc

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/DEPS ('k') | mandoline/ui/desktop_ui/browser_manager.h » ('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 // These tests are disabled pending refactoring of mandoline:browser 5 // These tests are disabled pending refactoring of mandoline:browser
6 #if 0 6 #if 0
7 #include "mandoline/ui/browser/browser.h" 7 #include "mandoline/ui/browser/browser.h"
8 8
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "components/view_manager/public/cpp/view.h" 10 #include "components/mus/public/cpp/view.h"
11 #include "mojo/application/public/cpp/application_connection.h" 11 #include "mojo/application/public/cpp/application_connection.h"
12 #include "mojo/application/public/cpp/application_delegate.h" 12 #include "mojo/application/public/cpp/application_delegate.h"
13 #include "mojo/application/public/cpp/application_impl.h" 13 #include "mojo/application/public/cpp/application_impl.h"
14 #include "mojo/application/public/cpp/application_test_base.h" 14 #include "mojo/application/public/cpp/application_test_base.h"
15 15
16 namespace mandoline { 16 namespace mandoline {
17 17
18 class TestBrowser : public Browser { 18 class TestBrowser : public Browser {
19 public: 19 public:
20 TestBrowser(mojo::ApplicationImpl* app, BrowserDelegate* delegate) 20 TestBrowser(mojo::ApplicationImpl* app, BrowserDelegate* delegate)
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // Deleting the view manager closes the connection. 143 // Deleting the view manager closes the connection.
144 delete browser1->root()->connection(); 144 delete browser1->root()->connection();
145 EXPECT_EQ(browser1, WaitForBrowserClosed()); 145 EXPECT_EQ(browser1, WaitForBrowserClosed());
146 146
147 delete browser2->root()->connection(); 147 delete browser2->root()->connection();
148 EXPECT_EQ(browser2, WaitForBrowserClosed()); 148 EXPECT_EQ(browser2, WaitForBrowserClosed());
149 } 149 }
150 150
151 } // namespace mandoline 151 } // namespace mandoline
152 #endif 152 #endif
OLDNEW
« no previous file with comments | « mandoline/ui/desktop_ui/DEPS ('k') | mandoline/ui/desktop_ui/browser_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698