| OLD | NEW |
| 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_root_window_host.h" | 8 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 10 #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h" | 10 #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides: | 46 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides: |
| 47 | 47 |
| 48 void DesktopBrowserFrameAura::OnHostClosed() { | 48 void DesktopBrowserFrameAura::OnHostClosed() { |
| 49 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), NULL); | 49 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), NULL); |
| 50 DesktopNativeWidgetAura::OnHostClosed(); | 50 DesktopNativeWidgetAura::OnHostClosed(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 void DesktopBrowserFrameAura::InitNativeWidget( | 53 void DesktopBrowserFrameAura::InitNativeWidget( |
| 54 const views::Widget::InitParams& params) { | 54 const views::Widget::InitParams& params) { |
| 55 browser_desktop_root_window_host_ = | 55 browser_desktop_root_window_host_ = |
| 56 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost( | 56 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 57 browser_frame_, | 57 browser_frame_, |
| 58 this, | 58 this, |
| 59 browser_view_, | 59 browser_view_, |
| 60 browser_frame_); | 60 browser_frame_); |
| 61 views::Widget::InitParams modified_params = params; | 61 views::Widget::InitParams modified_params = params; |
| 62 modified_params.desktop_root_window_host = | 62 modified_params.desktop_root_window_host = |
| 63 browser_desktop_root_window_host_->AsDesktopRootWindowHost(); | 63 browser_desktop_root_window_host_->AsDesktopWindowTreeHost(); |
| 64 DesktopNativeWidgetAura::InitNativeWidget(modified_params); | 64 DesktopNativeWidgetAura::InitNativeWidget(modified_params); |
| 65 | 65 |
| 66 user_action_client_.reset( | 66 user_action_client_.reset( |
| 67 new DesktopUserActionHandlerAura(browser_view_->browser())); | 67 new DesktopUserActionHandlerAura(browser_view_->browser())); |
| 68 aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(), | 68 aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(), |
| 69 user_action_client_.get()); | 69 user_action_client_.get()); |
| 70 | 70 |
| 71 visibility_controller_.reset(new views::corewm::VisibilityController); | 71 visibility_controller_.reset(new views::corewm::VisibilityController); |
| 72 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), | 72 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), |
| 73 visibility_controller_.get()); | 73 visibility_controller_.get()); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 86 return this; | 86 return this; |
| 87 } | 87 } |
| 88 | 88 |
| 89 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { | 89 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { |
| 90 return browser_desktop_root_window_host_->UsesNativeSystemMenu(); | 90 return browser_desktop_root_window_host_->UsesNativeSystemMenu(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { | 93 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { |
| 94 return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); | 94 return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); |
| 95 } | 95 } |
| OLD | NEW |