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_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" | 9 #include "chrome/browser/ui/views/frame/browser_shutdown.h" |
10 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
11 #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h" | |
12 #include "grit/chromium_strings.h" | 11 #include "grit/chromium_strings.h" |
13 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
14 #include "ui/aura/client/aura_constants.h" | 13 #include "ui/aura/client/aura_constants.h" |
15 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
16 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
17 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
18 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
19 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
20 #include "ui/base/models/simple_menu_model.h" | 19 #include "ui/base/models/simple_menu_model.h" |
21 #include "ui/gfx/font.h" | 20 #include "ui/gfx/font.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 60 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
62 browser_frame_, | 61 browser_frame_, |
63 this, | 62 this, |
64 browser_view_, | 63 browser_view_, |
65 browser_frame_); | 64 browser_frame_); |
66 views::Widget::InitParams modified_params = params; | 65 views::Widget::InitParams modified_params = params; |
67 modified_params.desktop_window_tree_host = | 66 modified_params.desktop_window_tree_host = |
68 browser_desktop_window_tree_host_->AsDesktopWindowTreeHost(); | 67 browser_desktop_window_tree_host_->AsDesktopWindowTreeHost(); |
69 DesktopNativeWidgetAura::InitNativeWidget(modified_params); | 68 DesktopNativeWidgetAura::InitNativeWidget(modified_params); |
70 | 69 |
71 user_action_client_.reset( | |
72 new DesktopUserActionHandlerAura(browser_view_->browser())); | |
73 aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(), | |
74 user_action_client_.get()); | |
75 | |
76 visibility_controller_.reset(new views::corewm::VisibilityController); | 70 visibility_controller_.reset(new views::corewm::VisibilityController); |
77 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), | 71 aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), |
78 visibility_controller_.get()); | 72 visibility_controller_.get()); |
79 views::corewm::SetChildWindowVisibilityChangesAnimated( | 73 views::corewm::SetChildWindowVisibilityChangesAnimated( |
80 GetNativeView()->GetRootWindow()); | 74 GetNativeView()->GetRootWindow()); |
81 } | 75 } |
82 | 76 |
83 //////////////////////////////////////////////////////////////////////////////// | 77 //////////////////////////////////////////////////////////////////////////////// |
84 // DesktopBrowserFrameAura, NativeBrowserFrame implementation: | 78 // DesktopBrowserFrameAura, NativeBrowserFrame implementation: |
85 | 79 |
86 views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() { | 80 views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() { |
87 return this; | 81 return this; |
88 } | 82 } |
89 | 83 |
90 const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const { | 84 const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const { |
91 return this; | 85 return this; |
92 } | 86 } |
93 | 87 |
94 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { | 88 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { |
95 return browser_desktop_window_tree_host_->UsesNativeSystemMenu(); | 89 return browser_desktop_window_tree_host_->UsesNativeSystemMenu(); |
96 } | 90 } |
97 | 91 |
98 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { | 92 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { |
99 return browser_desktop_window_tree_host_->GetMinimizeButtonOffset(); | 93 return browser_desktop_window_tree_host_->GetMinimizeButtonOffset(); |
100 } | 94 } |
OLD | NEW |