ui/ozone/ozone_platform.cc - Issue 230763004: Split ui/display types into separate module and have Ozone depend on it

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: ui/ozone/ozone_platform.cc

Issue 230763004: Split ui/display types into separate module and have Ozone depend on it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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 | Annotate | Revision Log

« ui/display/types/DEPS ('K') | « ui/ozone/ozone_platform.h ('k') | ui/ozone/platform/caca/ozone_platform_caca.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/debug/trace_event.h"	6 #include "base/debug/trace_event.h"

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

8 #include "ui/base/cursor/ozone/cursor_factory_ozone.h"	8 #include "ui/base/cursor/ozone/cursor_factory_ozone.h"

9 #include "ui/ozone/ozone_platform.h"	9 #include "ui/ozone/ozone_platform.h"

10 #include "ui/ozone/ozone_platform_list.h"	10 #include "ui/ozone/ozone_platform_list.h"

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58	58

59 // Inject ozone interfaces.	59 // Inject ozone interfaces.

60 gfx::SurfaceFactoryOzone::SetInstance(instance_->GetSurfaceFactoryOzone());	60 gfx::SurfaceFactoryOzone::SetInstance(instance_->GetSurfaceFactoryOzone());

61 ui::EventFactoryOzone::SetInstance(instance_->GetEventFactoryOzone());	61 ui::EventFactoryOzone::SetInstance(instance_->GetEventFactoryOzone());

62 ui::InputMethodContextFactoryOzone::SetInstance(	62 ui::InputMethodContextFactoryOzone::SetInstance(

63 instance_->GetInputMethodContextFactoryOzone());	63 instance_->GetInputMethodContextFactoryOzone());

64 ui::CursorFactoryOzone::SetInstance(instance_->GetCursorFactoryOzone());	64 ui::CursorFactoryOzone::SetInstance(instance_->GetCursorFactoryOzone());

65 }	65 }

66	66

67 // static	67 // static

	68 OzonePlatform* OzonePlatform::GetInstance() {

	69 CHECK(instance_) << "OzonePlatform is not initialized";

	70 return instance_;

	71 }

	72

	73 // static

68 OzonePlatform* OzonePlatform::instance_;	74 OzonePlatform* OzonePlatform::instance_;

69	75

70 } // namespace ui	76 } // namespace ui

OLD	NEW