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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/mus/ws/test_change_tracker.cc

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase Created 5 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
« no previous file with comments | « components/mus/ws/test_change_tracker.h ('k') | components/mus/ws/view_manager_client_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/test_change_tracker.cc
diff --git a/components/mus/ws/test_change_tracker.cc b/components/mus/ws/test_change_tracker.cc
index 4e4f09be578f1c4b8f4f08eb5285689c1e6b20f6..330e636912813a97226a86aa7e6e39cd7742ffb6 100644
--- a/components/mus/ws/test_change_tracker.cc
+++ b/components/mus/ws/test_change_tracker.cc
@@ -10,7 +10,6 @@
#include "mojo/common/common_type_converters.h"
using mojo::Array;
-using mojo::ViewDataPtr;
using mojo::String;
namespace mus {
@@ -27,8 +26,8 @@ std::string RectToString(const mojo::Rect& rect) {
rect.height);
}
-std::string DirectionToString(mojo::OrderDirection direction) {
- return direction == mojo::ORDER_DIRECTION_ABOVE ? "above" : "below";
+std::string DirectionToString(mojom::OrderDirection direction) {
+ return direction == mojom::ORDER_DIRECTION_ABOVE ? "above" : "below";
}
std::string ChangeToDescription1(const Change& change) {
@@ -38,7 +37,7 @@ std::string ChangeToDescription1(const Change& change) {
case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED:
return base::StringPrintf("OnEmbeddedAppDisconnected view=%s",
- ViewIdToString(change.view_id).c_str());
+ ViewIdToString(change.window_id).c_str());
case CHANGE_TYPE_UNEMBED:
return "OnUnembed";
@@ -46,7 +45,7 @@ std::string ChangeToDescription1(const Change& change) {
case CHANGE_TYPE_NODE_BOUNDS_CHANGED:
return base::StringPrintf(
"BoundsChanged view=%s old_bounds=%s new_bounds=%s",
- ViewIdToString(change.view_id).c_str(),
+ ViewIdToString(change.window_id).c_str(),
RectToString(change.bounds).c_str(),
RectToString(change.bounds2).c_str());
@@ -57,38 +56,38 @@ std::string ChangeToDescription1(const Change& change) {
case CHANGE_TYPE_NODE_HIERARCHY_CHANGED:
return base::StringPrintf(
"HierarchyChanged view=%s new_parent=%s old_parent=%s",
- ViewIdToString(change.view_id).c_str(),
- ViewIdToString(change.view_id2).c_str(),
- ViewIdToString(change.view_id3).c_str());
+ ViewIdToString(change.window_id).c_str(),
+ ViewIdToString(change.window_id2).c_str(),
+ ViewIdToString(change.window_id3).c_str());
case CHANGE_TYPE_NODE_REORDERED:
return base::StringPrintf("Reordered view=%s relative=%s direction=%s",
- ViewIdToString(change.view_id).c_str(),
- ViewIdToString(change.view_id2).c_str(),
+ ViewIdToString(change.window_id).c_str(),
+ ViewIdToString(change.window_id2).c_str(),
DirectionToString(change.direction).c_str());
case CHANGE_TYPE_NODE_DELETED:
return base::StringPrintf("ViewDeleted view=%s",
- ViewIdToString(change.view_id).c_str());
+ ViewIdToString(change.window_id).c_str());
case CHANGE_TYPE_NODE_VISIBILITY_CHANGED:
return base::StringPrintf("VisibilityChanged view=%s visible=%s",
- ViewIdToString(change.view_id).c_str(),
+ ViewIdToString(change.window_id).c_str(),
change.bool_value ? "true" : "false");
case CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED:
return base::StringPrintf("DrawnStateChanged view=%s drawn=%s",
- ViewIdToString(change.view_id).c_str(),
+ ViewIdToString(change.window_id).c_str(),
change.bool_value ? "true" : "false");
case CHANGE_TYPE_INPUT_EVENT:
return base::StringPrintf("InputEvent view=%s event_action=%d",
- ViewIdToString(change.view_id).c_str(),
+ ViewIdToString(change.window_id).c_str(),
change.event_action);
case CHANGE_TYPE_PROPERTY_CHANGED:
return base::StringPrintf("PropertyChanged view=%s key=%s value=%s",
- ViewIdToString(change.view_id).c_str(),
+ ViewIdToString(change.window_id).c_str(),
change.property_key.c_str(),
change.property_value.c_str());
@@ -98,7 +97,7 @@ std::string ChangeToDescription1(const Change& change) {
case CHANGE_TYPE_FOCUSED:
return base::StringPrintf("Focused id=%s",
- ViewIdToString(change.view_id).c_str());
+ ViewIdToString(change.window_id).c_str());
}
return std::string();
}
@@ -138,10 +137,10 @@ std::string ChangeViewDescription(const std::vector<Change>& changes) {
return base::JoinString(view_strings, ",");
}
-TestView ViewDataToTestView(const ViewDataPtr& data) {
+TestView WindowDataToTestView(const mojom::WindowDataPtr& data) {
TestView view;
view.parent_id = data->parent_id;
- view.view_id = data->view_id;
+ view.window_id = data->window_id;
view.visible = data->visible;
view.drawn = data->drawn;
view.properties =
@@ -149,20 +148,20 @@ TestView ViewDataToTestView(const ViewDataPtr& data) {
return view;
}
-void ViewDatasToTestViews(const Array<ViewDataPtr>& data,
- std::vector<TestView>* test_views) {
+void WindowDatasToTestViews(const Array<mojom::WindowDataPtr>& data,
+ std::vector<TestView>* test_views) {
for (size_t i = 0; i < data.size(); ++i)
- test_views->push_back(ViewDataToTestView(data[i]));
+ test_views->push_back(WindowDataToTestView(data[i]));
}
Change::Change()
: type(CHANGE_TYPE_EMBED),
connection_id(0),
- view_id(0),
- view_id2(0),
- view_id3(0),
+ window_id(0),
+ window_id2(0),
+ window_id3(0),
event_action(0),
- direction(mojo::ORDER_DIRECTION_ABOVE),
+ direction(mojom::ORDER_DIRECTION_ABOVE),
bool_value(false) {}
Change::~Change() {}
@@ -172,27 +171,27 @@ TestChangeTracker::TestChangeTracker() : delegate_(NULL) {}
TestChangeTracker::~TestChangeTracker() {}
void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id,
- ViewDataPtr root) {
+ mojom::WindowDataPtr root) {
Change change;
change.type = CHANGE_TYPE_EMBED;
change.connection_id = connection_id;
- change.views.push_back(ViewDataToTestView(root));
+ change.views.push_back(WindowDataToTestView(root));
AddChange(change);
}
-void TestChangeTracker::OnEmbeddedAppDisconnected(Id view_id) {
+void TestChangeTracker::OnEmbeddedAppDisconnected(Id window_id) {
Change change;
change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED;
- change.view_id = view_id;
+ change.window_id = window_id;
AddChange(change);
}
-void TestChangeTracker::OnWindowBoundsChanged(Id view_id,
+void TestChangeTracker::OnWindowBoundsChanged(Id window_id,
mojo::RectPtr old_bounds,
mojo::RectPtr new_bounds) {
Change change;
change.type = CHANGE_TYPE_NODE_BOUNDS_CHANGED;
- change.view_id = view_id;
+ change.window_id = window_id;
change.bounds.x = old_bounds->x;
change.bounds.y = old_bounds->y;
change.bounds.width = old_bounds->width;
@@ -211,75 +210,76 @@ void TestChangeTracker::OnUnembed() {
}
void TestChangeTracker::OnWindowViewportMetricsChanged(
- mojo::ViewportMetricsPtr old_metrics,
- mojo::ViewportMetricsPtr new_metrics) {
+ mojom::ViewportMetricsPtr old_metrics,
+ mojom::ViewportMetricsPtr new_metrics) {
Change change;
change.type = CHANGE_TYPE_NODE_VIEWPORT_METRICS_CHANGED;
// NOT IMPLEMENTED
AddChange(change);
}
-void TestChangeTracker::OnWindowHierarchyChanged(Id view_id,
- Id new_parent_id,
- Id old_parent_id,
- Array<ViewDataPtr> views) {
+void TestChangeTracker::OnWindowHierarchyChanged(
+ Id window_id,
+ Id new_parent_id,
+ Id old_parent_id,
+ Array<mojom::WindowDataPtr> views) {
Change change;
change.type = CHANGE_TYPE_NODE_HIERARCHY_CHANGED;
- change.view_id = view_id;
- change.view_id2 = new_parent_id;
- change.view_id3 = old_parent_id;
- ViewDatasToTestViews(views, &change.views);
+ change.window_id = window_id;
+ change.window_id2 = new_parent_id;
+ change.window_id3 = old_parent_id;
+ WindowDatasToTestViews(views, &change.views);
AddChange(change);
}
-void TestChangeTracker::OnWindowReordered(Id view_id,
- Id relative_view_id,
- mojo::OrderDirection direction) {
+void TestChangeTracker::OnWindowReordered(Id window_id,
+ Id relative_window_id,
+ mojom::OrderDirection direction) {
Change change;
change.type = CHANGE_TYPE_NODE_REORDERED;
- change.view_id = view_id;
- change.view_id2 = relative_view_id;
+ change.window_id = window_id;
+ change.window_id2 = relative_window_id;
change.direction = direction;
AddChange(change);
}
-void TestChangeTracker::OnWindowDeleted(Id view_id) {
+void TestChangeTracker::OnWindowDeleted(Id window_id) {
Change change;
change.type = CHANGE_TYPE_NODE_DELETED;
- change.view_id = view_id;
+ change.window_id = window_id;
AddChange(change);
}
-void TestChangeTracker::OnWindowVisibilityChanged(Id view_id, bool visible) {
+void TestChangeTracker::OnWindowVisibilityChanged(Id window_id, bool visible) {
Change change;
change.type = CHANGE_TYPE_NODE_VISIBILITY_CHANGED;
- change.view_id = view_id;
+ change.window_id = window_id;
change.bool_value = visible;
AddChange(change);
}
-void TestChangeTracker::OnWindowDrawnStateChanged(Id view_id, bool drawn) {
+void TestChangeTracker::OnWindowDrawnStateChanged(Id window_id, bool drawn) {
Change change;
change.type = CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED;
- change.view_id = view_id;
+ change.window_id = window_id;
change.bool_value = drawn;
AddChange(change);
}
-void TestChangeTracker::OnWindowInputEvent(Id view_id, mojo::EventPtr event) {
+void TestChangeTracker::OnWindowInputEvent(Id window_id, mojo::EventPtr event) {
Change change;
change.type = CHANGE_TYPE_INPUT_EVENT;
- change.view_id = view_id;
+ change.window_id = window_id;
change.event_action = event->action;
AddChange(change);
}
-void TestChangeTracker::OnWindowSharedPropertyChanged(Id view_id,
+void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id,
String name,
Array<uint8_t> data) {
Change change;
change.type = CHANGE_TYPE_PROPERTY_CHANGED;
- change.view_id = view_id;
+ change.window_id = window_id;
change.property_key = name;
if (data.is_null())
change.property_value = "NULL";
@@ -288,10 +288,10 @@ void TestChangeTracker::OnWindowSharedPropertyChanged(Id view_id,
AddChange(change);
}
-void TestChangeTracker::OnWindowFocused(Id view_id) {
+void TestChangeTracker::OnWindowFocused(Id window_id) {
Change change;
change.type = CHANGE_TYPE_FOCUSED;
- change.view_id = view_id;
+ change.window_id = window_id;
AddChange(change);
}
@@ -314,15 +314,15 @@ TestView::~TestView() {}
std::string TestView::ToString() const {
return base::StringPrintf("view=%s parent=%s",
- ViewIdToString(view_id).c_str(),
+ ViewIdToString(window_id).c_str(),
ViewIdToString(parent_id).c_str());
}
std::string TestView::ToString2() const {
return base::StringPrintf(
- "view=%s parent=%s visible=%s drawn=%s", ViewIdToString(view_id).c_str(),
- ViewIdToString(parent_id).c_str(), visible ? "true" : "false",
- drawn ? "true" : "false");
+ "view=%s parent=%s visible=%s drawn=%s",
+ ViewIdToString(window_id).c_str(), ViewIdToString(parent_id).c_str(),
+ visible ? "true" : "false", drawn ? "true" : "false");
}
} // namespace mus
« no previous file with comments | « components/mus/ws/test_change_tracker.h ('k') | components/mus/ws/view_manager_client_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698