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 "grit/chromium_strings.h" | 11 #include "grit/chromium_strings.h" |
12 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
13 #include "ui/aura/client/aura_constants.h" | 13 #include "ui/aura/client/aura_constants.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
17 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
19 #include "ui/base/models/simple_menu_model.h" | 19 #include "ui/base/models/simple_menu_model.h" |
20 #include "ui/gfx/font.h" | 20 #include "ui/gfx/font.h" |
21 #include "ui/views/corewm/visibility_controller.h" | |
22 #include "ui/views/view.h" | 21 #include "ui/views/view.h" |
| 22 #include "ui/wm/core/visibility_controller.h" |
23 | 23 |
24 using aura::Window; | 24 using aura::Window; |
25 | 25 |
26 /////////////////////////////////////////////////////////////////////////////// | 26 /////////////////////////////////////////////////////////////////////////////// |
27 // DesktopBrowserFrameAura, public: | 27 // DesktopBrowserFrameAura, public: |
28 | 28 |
29 DesktopBrowserFrameAura::DesktopBrowserFrameAura( | 29 DesktopBrowserFrameAura::DesktopBrowserFrameAura( |
30 BrowserFrame* browser_frame, | 30 BrowserFrame* browser_frame, |
31 BrowserView* browser_view) | 31 BrowserView* browser_view) |
32 : views::DesktopNativeWidgetAura(browser_frame), | 32 : views::DesktopNativeWidgetAura(browser_frame), |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 return this; | 85 return this; |
86 } | 86 } |
87 | 87 |
88 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { | 88 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { |
89 return browser_desktop_window_tree_host_->UsesNativeSystemMenu(); | 89 return browser_desktop_window_tree_host_->UsesNativeSystemMenu(); |
90 } | 90 } |
91 | 91 |
92 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { | 92 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { |
93 return browser_desktop_window_tree_host_->GetMinimizeButtonOffset(); | 93 return browser_desktop_window_tree_host_->GetMinimizeButtonOffset(); |
94 } | 94 } |
OLD | NEW |