| 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/browser_frame_aura.h" | 5 #include "chrome/browser/ui/views/frame/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_view.h" | 8 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 9 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" | 9 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" |
| 10 #include "grit/chromium_strings.h" | 10 #include "grit/chromium_strings.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 non_client_view(); | 108 non_client_view(); |
| 109 gfx::Point point_in_view_coords(p); | 109 gfx::Point point_in_view_coords(p); |
| 110 views::View::ConvertPointFromScreen(non_client_view, &point_in_view_coords); | 110 views::View::ConvertPointFromScreen(non_client_view, &point_in_view_coords); |
| 111 int hit_test = non_client_view->NonClientHitTest(point_in_view_coords); | 111 int hit_test = non_client_view->NonClientHitTest(point_in_view_coords); |
| 112 if (hit_test == HTCAPTION || hit_test == HTNOWHERE) { | 112 if (hit_test == HTCAPTION || hit_test == HTNOWHERE) { |
| 113 SystemMenuModelDelegate menu_delegate(browser_view(), | 113 SystemMenuModelDelegate menu_delegate(browser_view(), |
| 114 browser_view()->browser()); | 114 browser_view()->browser()); |
| 115 ui::SimpleMenuModel model(&menu_delegate); | 115 ui::SimpleMenuModel model(&menu_delegate); |
| 116 model.AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 116 model.AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 117 model.AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); | 117 model.AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); |
| 118 model.AddSeparator(); | 118 model.AddSeparator(ui::NORMAL_SEPARATOR); |
| 119 model.AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 119 model.AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 120 views::MenuModelAdapter menu_adapter(&model); | 120 views::MenuModelAdapter menu_adapter(&model); |
| 121 menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu())); | 121 menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu())); |
| 122 | 122 |
| 123 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, | 123 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, |
| 124 gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT, | 124 gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT, |
| 125 views::MenuRunner::HAS_MNEMONICS) == | 125 views::MenuRunner::HAS_MNEMONICS) == |
| 126 views::MenuRunner::MENU_DELETED) | 126 views::MenuRunner::MENU_DELETED) |
| 127 return; | 127 return; |
| 128 } | 128 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 BrowserFrame* browser_frame, | 180 BrowserFrame* browser_frame, |
| 181 BrowserView* browser_view) { | 181 BrowserView* browser_view) { |
| 182 return new BrowserFrameAura(browser_frame, browser_view); | 182 return new BrowserFrameAura(browser_frame, browser_view); |
| 183 } | 183 } |
| 184 | 184 |
| 185 /////////////////////////////////////////////////////////////////////////////// | 185 /////////////////////////////////////////////////////////////////////////////// |
| 186 // BrowserFrameAura, private: | 186 // BrowserFrameAura, private: |
| 187 | 187 |
| 188 BrowserFrameAura::~BrowserFrameAura() { | 188 BrowserFrameAura::~BrowserFrameAura() { |
| 189 } | 189 } |
| OLD | NEW |