mandoline/ui/desktop_ui/browser_window.cc - Issue 1344573002: Mandoline: Rename components/view_manager to components/mus

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: mandoline/ui/desktop_ui/browser_window.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/browser_window.h ('k') | mandoline/ui/desktop_ui/public/interfaces/BUILD.gn » ('j') | no next file with comments »

OLD	NEW
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 #include "mandoline/ui/desktop_ui/browser_window.h"	5 #include "mandoline/ui/desktop_ui/browser_window.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

11 #include "components/view_manager/public/cpp/scoped_view_ptr.h"	11 #include "components/mus/public/cpp/scoped_view_ptr.h"

12 #include "components/view_manager/public/cpp/view_tree_host_factory.h"	12 #include "components/mus/public/cpp/view_tree_host_factory.h"

13 #include "mandoline/ui/aura/native_widget_view_manager.h"	13 #include "mandoline/ui/aura/native_widget_view_manager.h"

14 #include "mandoline/ui/desktop_ui/browser_commands.h"	14 #include "mandoline/ui/desktop_ui/browser_commands.h"

15 #include "mandoline/ui/desktop_ui/browser_manager.h"	15 #include "mandoline/ui/desktop_ui/browser_manager.h"

16 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"	16 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"

17 #include "mojo/common/common_type_converters.h"	17 #include "mojo/common/common_type_converters.h"

18 #include "mojo/converters/geometry/geometry_type_converters.h"	18 #include "mojo/converters/geometry/geometry_type_converters.h"

19 #include "mojo/services/tracing/public/cpp/switches.h"	19 #include "mojo/services/tracing/public/cpp/switches.h"

20 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"	20 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"

21 #include "ui/gfx/canvas.h"	21 #include "ui/gfx/canvas.h"

22 #include "ui/views/background.h"	22 #include "ui/views/background.h"

(...skipping 330 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
353 omnibox_view_->Embed(view_tree_client.Pass());	353 omnibox_view_->Embed(view_tree_client.Pass());

354	354

355 // TODO(beng): This should be handled sufficiently by	355 // TODO(beng): This should be handled sufficiently by

356 // OmniboxImpl::ShowWindow() but unfortunately view manager policy	356 // OmniboxImpl::ShowWindow() but unfortunately view manager policy

357 // currently prevents the embedded app from changing window z for	357 // currently prevents the embedded app from changing window z for

358 // its own window.	358 // its own window.

359 omnibox_view_->MoveToFront();	359 omnibox_view_->MoveToFront();

360 }	360 }

361	361

362 } // namespace mandoline	362 } // namespace mandoline

OLD	NEW