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

Unified Diff: mash/wm/window_manager_impl.cc

Issue 1459653002: Gets mustash frames looking like that of ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test Created 5 years, 1 month 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 | « mash/wm/window_manager_application.cc ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_impl.cc
diff --git a/mash/wm/window_manager_impl.cc b/mash/wm/window_manager_impl.cc
index 06b6f9aa9a1bdab38c8b8796abac6e7ac2a002ea..0dec03ad36f8204ce42ee513e23e94de5b31396d 100644
--- a/mash/wm/window_manager_impl.cc
+++ b/mash/wm/window_manager_impl.cc
@@ -10,7 +10,6 @@
#include "components/mus/public/cpp/window_property.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/interfaces/input_events.mojom.h"
-#include "mash/wm/move_loop.h"
#include "mash/wm/non_client_frame_controller.h"
#include "mash/wm/property_util.h"
#include "mash/wm/public/interfaces/container.mojom.h"
@@ -125,17 +124,11 @@ void WindowManagerImpl::GetConfig(const GetConfigCallback& callback) {
// The insets are roughly what is needed by CustomFrameView. The expectation
// is at some point we'll write our own NonClientFrameView and get the insets
// from it.
- config->normal_client_area_insets = mojo::Insets::New();
- config->normal_client_area_insets->top = 23;
- config->normal_client_area_insets->left = 5;
- config->normal_client_area_insets->right = 5;
- config->normal_client_area_insets->bottom = 5;
-
- config->maximized_client_area_insets = mojo::Insets::New();
- config->maximized_client_area_insets->top = 21;
- config->maximized_client_area_insets->left = 0;
- config->maximized_client_area_insets->right = 0;
- config->maximized_client_area_insets->bottom = 0;
+ const gfx::Insets client_area_insets =
+ NonClientFrameController::GetPreferredClientAreaInsets();
+ config->normal_client_area_insets = mojo::Insets::From(client_area_insets);
+
+ config->maximized_client_area_insets = mojo::Insets::From(client_area_insets);
callback.Run(config.Pass());
}
« no previous file with comments | « mash/wm/window_manager_application.cc ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698