examples/wm_flow/wm/frame_controller.cc - Issue 818583002: Moves Create() off of View and onto ViewManager

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

Unified Diff: examples/wm_flow/wm/frame_controller.cc

Issue 818583002: Moves Create() off of View and onto ViewManager (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: merge 2 trunk Created 6 years ago

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

Jump to:

Index: examples/wm_flow/wm/frame_controller.cc

diff --git a/examples/wm_flow/wm/frame_controller.cc b/examples/wm_flow/wm/frame_controller.cc

index acf608c92a7e8111d0f7cad7abcccd10aa771896..895044525bd61e8fe6b42ad71e4838b452232bf6 100644

--- a/examples/wm_flow/wm/frame_controller.cc

+++ b/examples/wm_flow/wm/frame_controller.cc

@@ -8,6 +8,7 @@

#include "base/strings/utf_string_conversions.h"

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

#include "mojo/services/view_manager/public/cpp/view.h"

+#include "mojo/services/view_manager/public/cpp/view_manager.h"

#include "mojo/views/native_widget_mojo.h"

#include "services/window_manager/capture_controller.h"

#include "services/window_manager/window_manager_app.h"

@@ -115,7 +116,7 @@ FrameController::FrameController(

mojo::View** app_view,

window_manager::WindowManagerApp* window_manager_app)

: view_(view),

- app_view_(mojo::View::Create(view->view_manager())),

+ app_view_(view->view_manager()->CreateView()),

frame_view_(new views::View),

frame_view_layout_manager_(new LayoutManager(this)),

widget_(new views::Widget),

« no previous file with comments | « examples/wm_flow/app/app.cc ('k') | examples/wm_flow/wm/wm.cc » ('j') | no next file with comments »