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

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

Issue 10286004: Landed by mistake. Reverting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // Updates the DWM with the frame bounds. 70 // Updates the DWM with the frame bounds.
71 void UpdateDWMFrame(); 71 void UpdateDWMFrame();
72 72
73 // Builds the correct menu for when we have minimal chrome. 73 // Builds the correct menu for when we have minimal chrome.
74 void BuildSystemMenuForBrowserWindow(); 74 void BuildSystemMenuForBrowserWindow();
75 void BuildSystemMenuForAppOrPopupWindow(); 75 void BuildSystemMenuForAppOrPopupWindow();
76 76
77 // Adds optional debug items for frame type toggling. 77 // Adds optional debug items for frame type toggling.
78 void AddFrameToggleItems(); 78 void AddFrameToggleItems();
79 79
80 // Handles metro navigation and search requests. 80 // Handles metro navigation search requests.
81 void HandleMetroNavSearchRequest(WPARAM w_param, LPARAM l_param); 81 void HandleMetroRequest(WPARAM w_param, LPARAM l_param);
82
83 // Returns information about the currently displayed tab in metro mode.
84 void GetMetroCurrentTabInfo(WPARAM w_param);
85 82
86 // The BrowserView is our ClientView. This is a pointer to it. 83 // The BrowserView is our ClientView. This is a pointer to it.
87 BrowserView* browser_view_; 84 BrowserView* browser_view_;
88 85
89 BrowserFrame* browser_frame_; 86 BrowserFrame* browser_frame_;
90 87
91 // The additional items we insert into the system menu. 88 // The additional items we insert into the system menu.
92 scoped_ptr<SystemMenuModelDelegate> system_menu_delegate_; 89 scoped_ptr<SystemMenuModelDelegate> system_menu_delegate_;
93 scoped_ptr<SystemMenuModel> system_menu_contents_; 90 scoped_ptr<SystemMenuModel> system_menu_contents_;
94 scoped_ptr<ZoomMenuModel> zoom_menu_contents_; 91 scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
95 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; 92 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
96 // The wrapped system menu itself. 93 // The wrapped system menu itself.
97 scoped_ptr<views::NativeMenuWin> system_menu_; 94 scoped_ptr<views::NativeMenuWin> system_menu_;
98 95
99 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin); 96 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
100 }; 97 };
101 98
102 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 99 #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