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

Unified Diff: views/widget/widget.h

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: views/widget/widget.h
diff --git a/views/widget/widget.h b/views/widget/widget.h
index e361c596fcbb719550694bee761347a380a883e0..296cab06b7c60daf6c0e52040e7dd0152ab6d382 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -496,13 +496,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
return non_client_view_ ? non_client_view_->client_view() : NULL;
}
- static void set_compositor_factory_for_testing(ui::Compositor*(*factory)()) {
- compositor_factory_ = factory;
- }
- static ui::Compositor* (*compositor_factory())() {
- return compositor_factory_;
- }
-
const ui::Compositor* GetCompositor() const;
ui::Compositor* GetCompositor();
@@ -722,9 +715,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// See |is_top_level()| accessor.
bool is_top_level_;
- // Factory used to create Compositors. Settable by tests.
- static ui::Compositor*(*compositor_factory_)();
-
// Tracks whether native widget has been initialized.
bool native_widget_initialized_;

Powered by Google App Engine
This is Rietveld 408576698