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

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

Issue 31043006: Moves creation of various clients to DesktopNativeWidgetAura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 7 years, 2 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 | Annotate | Revision Log
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_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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost(
57 browser_frame_, 57 browser_frame_,
58 this, 58 this,
59 params.bounds,
60 browser_view_, 59 browser_view_,
61 browser_frame_); 60 browser_frame_);
62 views::Widget::InitParams modified_params = params; 61 views::Widget::InitParams modified_params = params;
63 modified_params.desktop_root_window_host = 62 modified_params.desktop_root_window_host =
64 browser_desktop_root_window_host_->AsDesktopRootWindowHost(); 63 browser_desktop_root_window_host_->AsDesktopRootWindowHost();
65 DesktopNativeWidgetAura::InitNativeWidget(modified_params); 64 DesktopNativeWidgetAura::InitNativeWidget(modified_params);
66 65
67 user_action_client_.reset( 66 user_action_client_.reset(
68 new DesktopUserActionHandlerAura(browser_view_->browser())); 67 new DesktopUserActionHandlerAura(browser_view_->browser()));
69 aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(), 68 aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(),
(...skipping 20 matching lines...) Expand all
90 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { 89 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const {
91 return browser_desktop_root_window_host_->UsesNativeSystemMenu(); 90 return browser_desktop_root_window_host_->UsesNativeSystemMenu();
92 } 91 }
93 92
94 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { 93 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const {
95 return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); 94 return browser_desktop_root_window_host_->GetMinimizeButtonOffset();
96 } 95 }
97 96
98 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() { 97 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() {
99 } 98 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698