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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 9693022: views: Rename MenuButtonDelegate::RunMenu to something more obvious. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: menu_button_listener.h Created 8 years, 9 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/panels/panel_browser_frame_view.h" 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 return; 628 return;
629 BrowserNonClientFrameView::OnMouseCaptureLost(); 629 BrowserNonClientFrameView::OnMouseCaptureLost();
630 } 630 }
631 631
632 void PanelBrowserFrameView::ButtonPressed(views::Button* sender, 632 void PanelBrowserFrameView::ButtonPressed(views::Button* sender,
633 const views::Event& event) { 633 const views::Event& event) {
634 if (sender == close_button_) 634 if (sender == close_button_)
635 frame()->Close(); 635 frame()->Close();
636 } 636 }
637 637
638 void PanelBrowserFrameView::RunMenu(View* source, const gfx::Point& pt) { 638 void PanelBrowserFrameView::OnMenuButtonClicked(views::View* source,
639 const gfx::Point& point) {
639 if (!EnsureSettingsMenuCreated()) 640 if (!EnsureSettingsMenuCreated())
640 return; 641 return;
641 642
642 DCHECK_EQ(settings_button_, source); 643 DCHECK_EQ(settings_button_, source);
643 gfx::Point screen_point; 644 gfx::Point screen_point;
644 views::View::ConvertPointToScreen(source, &screen_point); 645 views::View::ConvertPointToScreen(source, &screen_point);
645 if (settings_menu_runner_->RunMenuAt(source->GetWidget(), 646 if (settings_menu_runner_->RunMenuAt(source->GetWidget(),
646 settings_button_, gfx::Rect(screen_point, source->size()), 647 settings_button_, gfx::Rect(screen_point, source->size()),
647 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == 648 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
648 views::MenuRunner::MENU_DELETED) 649 views::MenuRunner::MENU_DELETED)
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 929
929 settings_menu_model_.reset( 930 settings_menu_model_.reset(
930 new PanelSettingsMenuModel(panel_browser_view_->panel())); 931 new PanelSettingsMenuModel(panel_browser_view_->panel()));
931 settings_menu_adapter_.reset( 932 settings_menu_adapter_.reset(
932 new views::MenuModelAdapter(settings_menu_model_.get())); 933 new views::MenuModelAdapter(settings_menu_model_.get()));
933 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); 934 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
934 settings_menu_adapter_->BuildMenu(settings_menu_); 935 settings_menu_adapter_->BuildMenu(settings_menu_);
935 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); 936 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
936 return true; 937 return true;
937 } 938 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_frame_view.h ('k') | chrome/browser/ui/views/app_menu_button_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698