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

Side by Side Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc

Issue 2015223002: MacViews: Fixed BrowserViewTest.CloseWithTabsStartWithActive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 5 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" 8 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"
9 #include "chrome/browser/ui/views/frame/browser_shutdown.h"
10 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
11 #include "chrome/browser/web_applications/web_app.h" 10 #include "chrome/browser/web_applications/web_app.h"
12 #include "ui/aura/client/aura_constants.h" 11 #include "ui/aura/client/aura_constants.h"
13 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
14 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
15 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
16 #include "ui/base/hit_test.h" 15 #include "ui/base/hit_test.h"
17 #include "ui/base/models/simple_menu_model.h" 16 #include "ui/base/models/simple_menu_model.h"
18 #include "ui/gfx/font.h" 17 #include "ui/gfx/font.h"
19 #include "ui/views/view.h" 18 #include "ui/views/view.h"
(...skipping 18 matching lines...) Expand all
38 /////////////////////////////////////////////////////////////////////////////// 37 ///////////////////////////////////////////////////////////////////////////////
39 // DesktopBrowserFrameAura, protected: 38 // DesktopBrowserFrameAura, protected:
40 39
41 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() { 40 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() {
42 } 41 }
43 42
44 /////////////////////////////////////////////////////////////////////////////// 43 ///////////////////////////////////////////////////////////////////////////////
45 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides: 44 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides:
46 45
47 void DesktopBrowserFrameAura::OnHostClosed() { 46 void DesktopBrowserFrameAura::OnHostClosed() {
48 // Destroy any remaining WebContents early on. Doing so may result in
49 // calling back to one of the Views/LayoutManagers or supporting classes of
50 // BrowserView. By destroying here we ensure all said classes are valid.
51 DestroyBrowserWebContents(browser_view_->browser());
52 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), nullptr); 47 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), nullptr);
53 DesktopNativeWidgetAura::OnHostClosed(); 48 DesktopNativeWidgetAura::OnHostClosed();
54 } 49 }
55 50
56 void DesktopBrowserFrameAura::InitNativeWidget( 51 void DesktopBrowserFrameAura::InitNativeWidget(
57 const views::Widget::InitParams& params) { 52 const views::Widget::InitParams& params) {
58 browser_desktop_window_tree_host_ = 53 browser_desktop_window_tree_host_ =
59 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 54 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
60 browser_frame_, 55 browser_frame_,
61 this, 56 this,
62 browser_view_, 57 browser_view_,
63 browser_frame_); 58 browser_frame_);
64 views::Widget::InitParams modified_params = params; 59 views::Widget::InitParams modified_params = params;
65 modified_params.desktop_window_tree_host = 60 modified_params.desktop_window_tree_host =
66 browser_desktop_window_tree_host_->AsDesktopWindowTreeHost(); 61 browser_desktop_window_tree_host_->AsDesktopWindowTreeHost();
67 DesktopNativeWidgetAura::InitNativeWidget(modified_params); 62 DesktopNativeWidgetAura::InitNativeWidget(modified_params);
68 63
69 visibility_controller_.reset(new wm::VisibilityController); 64 visibility_controller_.reset(new wm::VisibilityController);
tapted 2016/05/30 23:43:55 hm - I wonder if there's a way to make this obsole
70 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), 65 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(),
71 visibility_controller_.get()); 66 visibility_controller_.get());
72 wm::SetChildWindowVisibilityChangesAnimated( 67 wm::SetChildWindowVisibilityChangesAnimated(
73 GetNativeView()->GetRootWindow()); 68 GetNativeView()->GetRootWindow());
74 } 69 }
75 70
76 //////////////////////////////////////////////////////////////////////////////// 71 ////////////////////////////////////////////////////////////////////////////////
77 // DesktopBrowserFrameAura, NativeBrowserFrame implementation: 72 // DesktopBrowserFrameAura, NativeBrowserFrame implementation:
78 73
79 views::Widget::InitParams DesktopBrowserFrameAura::GetWidgetParams() { 74 views::Widget::InitParams DesktopBrowserFrameAura::GetWidgetParams() {
(...skipping 23 matching lines...) Expand all
103 gfx::Rect* bounds, 98 gfx::Rect* bounds,
104 ui::WindowShowState* show_state) const { 99 ui::WindowShowState* show_state) const {
105 *bounds = GetWidget()->GetRestoredBounds(); 100 *bounds = GetWidget()->GetRestoredBounds();
106 if (IsMaximized()) 101 if (IsMaximized())
107 *show_state = ui::SHOW_STATE_MAXIMIZED; 102 *show_state = ui::SHOW_STATE_MAXIMIZED;
108 else if (IsMinimized()) 103 else if (IsMinimized())
109 *show_state = ui::SHOW_STATE_MINIMIZED; 104 *show_state = ui::SHOW_STATE_MINIMIZED;
110 else 105 else
111 *show_state = ui::SHOW_STATE_NORMAL; 106 *show_state = ui::SHOW_STATE_NORMAL;
112 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698