| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.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" | 10 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 ui::SimpleMenuModel model(&menu_delegate); | 118 ui::SimpleMenuModel model(&menu_delegate); |
| 119 model.AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 119 model.AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 120 model.AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); | 120 model.AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); |
| 121 model.AddSeparator(ui::NORMAL_SEPARATOR); | 121 model.AddSeparator(ui::NORMAL_SEPARATOR); |
| 122 model.AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 122 model.AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 123 views::MenuModelAdapter menu_adapter(&model); | 123 views::MenuModelAdapter menu_adapter(&model); |
| 124 menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu())); | 124 menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu())); |
| 125 | 125 |
| 126 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, | 126 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, |
| 127 gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT, | 127 gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT, |
| 128 views::MenuRunner::HAS_MNEMONICS) == | 128 views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == |
| 129 views::MenuRunner::MENU_DELETED) | 129 views::MenuRunner::MENU_DELETED) |
| 130 return; | 130 return; |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 | 133 |
| 134 /////////////////////////////////////////////////////////////////////////////// | 134 /////////////////////////////////////////////////////////////////////////////// |
| 135 // BrowserFrameAura, views::NativeWidgetAura overrides: | 135 // BrowserFrameAura, views::NativeWidgetAura overrides: |
| 136 | 136 |
| 137 void BrowserFrameAura::OnWindowDestroying() { | 137 void BrowserFrameAura::OnWindowDestroying() { |
| 138 // Window is destroyed before our destructor is called, so clean up our | 138 // Window is destroyed before our destructor is called, so clean up our |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 199 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
| 200 #endif | 200 #endif |
| 201 return new BrowserFrameAura(browser_frame, browser_view); | 201 return new BrowserFrameAura(browser_frame, browser_view); |
| 202 } | 202 } |
| 203 | 203 |
| 204 /////////////////////////////////////////////////////////////////////////////// | 204 /////////////////////////////////////////////////////////////////////////////// |
| 205 // BrowserFrameAura, private: | 205 // BrowserFrameAura, private: |
| 206 | 206 |
| 207 BrowserFrameAura::~BrowserFrameAura() { | 207 BrowserFrameAura::~BrowserFrameAura() { |
| 208 } | 208 } |
| OLD | NEW |