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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_win.h

Issue 9966007: views: Extract SystemMenuModel from native_menu_win.*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include string16 Created 8 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/ui/views/frame/browser_frame.h" 11 #include "chrome/browser/ui/views/frame/browser_frame.h"
12 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 12 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
13 #include "ui/views/widget/native_widget_win.h" 13 #include "ui/views/widget/native_widget_win.h"
14 14
15 class BrowserView; 15 class BrowserView;
16 class EncodingMenuModel; 16 class EncodingMenuModel;
17 class SystemMenuModel;
17 class SystemMenuModelDelegate; 18 class SystemMenuModelDelegate;
18 class ZoomMenuModel; 19 class ZoomMenuModel;
19 20
20 namespace views { 21 namespace views {
21 class NativeMenuWin; 22 class NativeMenuWin;
22 class SystemMenuModel;
23 } 23 }
24 24
25 //////////////////////////////////////////////////////////////////////////////// 25 ////////////////////////////////////////////////////////////////////////////////
26 // BrowserFrameWin 26 // BrowserFrameWin
27 // 27 //
28 // BrowserFrameWin is a NativeWidgetWin subclass that provides the window frame 28 // BrowserFrameWin is a NativeWidgetWin subclass that provides the window frame
29 // for the Chrome browser window. 29 // for the Chrome browser window.
30 // 30 //
31 class BrowserFrameWin : public views::NativeWidgetWin, 31 class BrowserFrameWin : public views::NativeWidgetWin,
32 public NativeBrowserFrame { 32 public NativeBrowserFrame {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // Adds optional debug items for frame type toggling. 72 // Adds optional debug items for frame type toggling.
73 void AddFrameToggleItems(); 73 void AddFrameToggleItems();
74 74
75 // The BrowserView is our ClientView. This is a pointer to it. 75 // The BrowserView is our ClientView. This is a pointer to it.
76 BrowserView* browser_view_; 76 BrowserView* browser_view_;
77 77
78 BrowserFrame* browser_frame_; 78 BrowserFrame* browser_frame_;
79 79
80 // The additional items we insert into the system menu. 80 // The additional items we insert into the system menu.
81 scoped_ptr<SystemMenuModelDelegate> system_menu_delegate_; 81 scoped_ptr<SystemMenuModelDelegate> system_menu_delegate_;
82 scoped_ptr<views::SystemMenuModel> system_menu_contents_; 82 scoped_ptr<SystemMenuModel> system_menu_contents_;
83 scoped_ptr<ZoomMenuModel> zoom_menu_contents_; 83 scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
84 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; 84 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
85 // The wrapped system menu itself. 85 // The wrapped system menu itself.
86 scoped_ptr<views::NativeMenuWin> system_menu_; 86 scoped_ptr<views::NativeMenuWin> system_menu_;
87 87
88 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin); 88 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
89 }; 89 };
90 90
91 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 91 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698