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

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

Issue 11819008: Refactors building the system menu model into a common place (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk and fix windows build Created 7 years, 11 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/system_menu_model_delegate.h"
11 #include "grit/chromium_strings.h" 10 #include "grit/chromium_strings.h"
12 #include "grit/generated_resources.h" 11 #include "grit/generated_resources.h"
13 #include "ui/aura/client/aura_constants.h" 12 #include "ui/aura/client/aura_constants.h"
14 #include "ui/aura/root_window.h" 13 #include "ui/aura/root_window.h"
15 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
16 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
17 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
18 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/models/simple_menu_model.h" 18 #include "ui/base/models/simple_menu_model.h"
20 #include "ui/gfx/font.h" 19 #include "ui/gfx/font.h"
21 #include "ui/views/controls/menu/menu_model_adapter.h"
22 #include "ui/views/controls/menu/menu_runner.h"
23 #include "ui/views/corewm/visibility_controller.h" 20 #include "ui/views/corewm/visibility_controller.h"
24 #include "ui/views/view.h" 21 #include "ui/views/view.h"
25 22
26 using aura::Window; 23 using aura::Window;
27 24
28 /////////////////////////////////////////////////////////////////////////////// 25 ///////////////////////////////////////////////////////////////////////////////
29 // DesktopBrowserFrameAura, public: 26 // DesktopBrowserFrameAura, public:
30 27
31 DesktopBrowserFrameAura::DesktopBrowserFrameAura( 28 DesktopBrowserFrameAura::DesktopBrowserFrameAura(
32 BrowserFrame* browser_frame, 29 BrowserFrame* browser_frame,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // DesktopBrowserFrameAura, NativeBrowserFrame implementation: 68 // DesktopBrowserFrameAura, NativeBrowserFrame implementation:
72 69
73 views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() { 70 views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() {
74 return this; 71 return this;
75 } 72 }
76 73
77 const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const { 74 const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const {
78 return this; 75 return this;
79 } 76 }
80 77
81 void DesktopBrowserFrameAura::InitSystemContextMenu() { 78 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const {
79 return browser_desktop_root_window_host_->UsesNativeSystemMenu();
82 } 80 }
83 81
84 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { 82 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const {
85 return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); 83 return browser_desktop_root_window_host_->GetMinimizeButtonOffset();
86 } 84 }
87 85
88 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() { 86 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() {
89 } 87 }
90 88
91 /////////////////////////////////////////////////////////////////////////////// 89 ///////////////////////////////////////////////////////////////////////////////
92 // DesktopBrowserFrameAura, private: 90 // DesktopBrowserFrameAura, private:
93 91
94 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() { 92 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() {
95 } 93 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/desktop_browser_frame_aura.h ('k') | chrome/browser/ui/views/frame/native_browser_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698