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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 1565243002: Fixes bug where client area would not get set correctly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 shadow_controller_.reset(new wm::ShadowController( 540 shadow_controller_.reset(new wm::ShadowController(
541 aura::client::GetActivationClient(host_->window()))); 541 aura::client::GetActivationClient(host_->window())));
542 542
543 OnSizeConstraintsChanged(); 543 OnSizeConstraintsChanged();
544 544
545 window_reorderer_.reset(new WindowReorderer(content_window_, 545 window_reorderer_.reset(new WindowReorderer(content_window_,
546 GetWidget()->GetRootView())); 546 GetWidget()->GetRootView()));
547 } 547 }
548 548
549 void DesktopNativeWidgetAura::OnWidgetInitDone() {}
550
549 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { 551 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() {
550 return ShouldUseNativeFrame() ? new NativeFrameView(GetWidget()) : NULL; 552 return ShouldUseNativeFrame() ? new NativeFrameView(GetWidget()) : NULL;
551 } 553 }
552 554
553 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { 555 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const {
554 return desktop_window_tree_host_->ShouldUseNativeFrame(); 556 return desktop_window_tree_host_->ShouldUseNativeFrame();
555 } 557 }
556 558
557 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { 559 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const {
558 return desktop_window_tree_host_->ShouldWindowContentsBeTransparent(); 560 return desktop_window_tree_host_->ShouldWindowContentsBeTransparent();
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 if (cursor_reference_count_ == 0) { 1206 if (cursor_reference_count_ == 0) {
1205 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1207 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1206 // for cleaning up |cursor_manager_|. 1208 // for cleaning up |cursor_manager_|.
1207 delete cursor_manager_; 1209 delete cursor_manager_;
1208 native_cursor_manager_ = NULL; 1210 native_cursor_manager_ = NULL;
1209 cursor_manager_ = NULL; 1211 cursor_manager_ = NULL;
1210 } 1212 }
1211 } 1213 }
1212 1214
1213 } // namespace views 1215 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.h ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698