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

Unified Diff: ash/mus/non_client_frame_controller.cc

Issue 2690363002: chromeos: removes mash shadows (Closed)
Patch Set: merge Created 3 years, 10 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 | « ash/mus/BUILD.gn ('k') | ash/mus/shadow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 64bc0c442da8124a82ec7933194ac6e5e9244148..1cad4f35c9c0259032649bf557eba5d2ca41f8bb 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -19,7 +19,6 @@
#include "ash/mus/frame/detached_title_area_renderer.h"
#include "ash/mus/move_event_handler.h"
#include "ash/mus/property_util.h"
-#include "ash/mus/shadow.h"
#include "ash/mus/window_manager.h"
#include "ash/mus/window_properties.h"
#include "ash/shared/immersive_fullscreen_controller_delegate.h"
@@ -202,30 +201,11 @@ class WmNativeWidgetAura : public views::NativeWidgetAura {
return new CustomFrameViewMus(GetWidget(), immersive_delegate_.get(),
enable_immersive_);
}
- void InitNativeWidget(const views::Widget::InitParams& params) override {
- views::NativeWidgetAura::InitNativeWidget(params);
- // TODO(sky): shadow should be determined by window type and shadow type.
- shadow_ = base::MakeUnique<Shadow>();
- shadow_->Init(Shadow::STYLE_INACTIVE);
- aura::Window* window = GetNativeWindow();
- shadow_->Install(window);
- window->layer()->Add(shadow_->layer());
- shadow_->layer()->parent()->StackAtBottom(shadow_->layer());
- }
- void OnBoundsChanged(const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
- views::NativeWidgetAura::OnBoundsChanged(old_bounds, new_bounds);
- if (shadow_)
- shadow_->SetContentBounds(gfx::Rect(new_bounds.size()));
- }
private:
const bool remove_standard_frame_;
const bool enable_immersive_;
- // The shadow, may be null.
- std::unique_ptr<Shadow> shadow_;
-
std::unique_ptr<MoveEventHandler> move_event_handler_;
aura::WindowManagerClient* window_manager_client_;
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/shadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698