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

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

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
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/browser_frame_win.h" 5 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <set> 10 #include <set>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 15 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 16 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/frame/system_menu_model.h"
17 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" 18 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
18 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
19 #include "content/public/browser/browser_accessibility_state.h" 20 #include "content/public/browser/browser_accessibility_state.h"
20 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
22 #include "ui/base/models/simple_menu_model.h" 23 #include "ui/base/models/simple_menu_model.h"
23 #include "ui/base/theme_provider.h" 24 #include "ui/base/theme_provider.h"
24 #include "ui/gfx/font.h" 25 #include "ui/gfx/font.h"
25 #include "ui/views/controls/menu/native_menu_win.h" 26 #include "ui/views/controls/menu/native_menu_win.h"
26 #include "ui/views/views_delegate.h" 27 #include "ui/views/views_delegate.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 157
157 views::NativeWidget* BrowserFrameWin::AsNativeWidget() { 158 views::NativeWidget* BrowserFrameWin::AsNativeWidget() {
158 return this; 159 return this;
159 } 160 }
160 161
161 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const { 162 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const {
162 return this; 163 return this;
163 } 164 }
164 165
165 void BrowserFrameWin::InitSystemContextMenu() { 166 void BrowserFrameWin::InitSystemContextMenu() {
166 system_menu_contents_.reset(new views::SystemMenuModel( 167 system_menu_contents_.reset(new SystemMenuModel(system_menu_delegate_.get()));
167 system_menu_delegate_.get()));
168 // We add the menu items in reverse order so that insertion_index never needs 168 // We add the menu items in reverse order so that insertion_index never needs
169 // to change. 169 // to change.
170 if (browser_view_->IsBrowserTypeNormal()) 170 if (browser_view_->IsBrowserTypeNormal())
171 BuildSystemMenuForBrowserWindow(); 171 BuildSystemMenuForBrowserWindow();
172 else 172 else
173 BuildSystemMenuForAppOrPopupWindow(); 173 BuildSystemMenuForAppOrPopupWindow();
174 system_menu_.reset( 174 system_menu_.reset(
175 new views::NativeMenuWin(system_menu_contents_.get(), GetNativeWindow())); 175 new views::NativeMenuWin(system_menu_contents_.get(), GetNativeWindow()));
176 system_menu_->Rebuild(); 176 system_menu_->Rebuild();
177 } 177 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 297
298 //////////////////////////////////////////////////////////////////////////////// 298 ////////////////////////////////////////////////////////////////////////////////
299 // NativeBrowserFrame, public: 299 // NativeBrowserFrame, public:
300 300
301 // static 301 // static
302 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 302 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
303 BrowserFrame* browser_frame, 303 BrowserFrame* browser_frame,
304 BrowserView* browser_view) { 304 BrowserView* browser_view) {
305 return new BrowserFrameWin(browser_frame, browser_view); 305 return new BrowserFrameWin(browser_frame, browser_view);
306 } 306 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.h ('k') | chrome/browser/ui/views/frame/system_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698