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

Side by Side Diff: chrome/browser/ui/views/compact_nav/compact_options_bar.cc

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/compact_nav/compact_options_bar.h" 5 #include "chrome/browser/ui/views/compact_nav/compact_options_bar.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 8 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/browser/ui/views/event_utils.h" 10 #include "chrome/browser/ui/views/event_utils.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 app_menu_->SetBounds(kEndPadding, 0, button_size.width(), height()); 87 app_menu_->SetBounds(kEndPadding, 0, button_size.width(), height());
88 } 88 }
89 89
90 //////////////////////////////////////////////////////////////////////////////// 90 ////////////////////////////////////////////////////////////////////////////////
91 // CompactOptionsBar, views::MenuDelegate implementation: 91 // CompactOptionsBar, views::MenuDelegate implementation:
92 92
93 void CompactOptionsBar::RunMenu(views::View* source, 93 void CompactOptionsBar::RunMenu(views::View* source,
94 const gfx::Point& /* pt */) { 94 const gfx::Point& /* pt */) {
95 DCHECK_EQ(VIEW_ID_APP_MENU, source->id()); 95 DCHECK_EQ(VIEW_ID_APP_MENU, source->id());
96 96
97 wrench_menu_ = new WrenchMenu(browser_view_->browser()); 97 wrench_menu_.reset(new WrenchMenu(browser_view_->browser()));
98 wrench_menu_->Init(wrench_menu_model_.get()); 98 wrench_menu_->Init(wrench_menu_model_.get());
99 99
100 for (size_t i = 0; i < menu_listeners_.size(); ++i) 100 for (size_t i = 0; i < menu_listeners_.size(); ++i)
101 menu_listeners_[i]->OnMenuOpened(); 101 menu_listeners_[i]->OnMenuOpened();
102 102
103 // Note that this might be destroyed while the menu is running. 103 // Note that this might be destroyed while the menu is running.
104 wrench_menu_->RunMenu(app_menu_); 104 wrench_menu_->RunMenu(app_menu_);
105 } 105 }
106 106
107 //////////////////////////////////////////////////////////////////////////////// 107 ////////////////////////////////////////////////////////////////////////////////
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 void CompactOptionsBar::LoadImages() { 142 void CompactOptionsBar::LoadImages() {
143 // Reuse the resources loaded for the Toolbar's AppMenu. 143 // Reuse the resources loaded for the Toolbar's AppMenu.
144 DCHECK(browser_view_->toolbar()); 144 DCHECK(browser_view_->toolbar());
145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon( 145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon(
146 views::CustomButton::BS_NORMAL)); 146 views::CustomButton::BS_NORMAL));
147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon( 147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon(
148 views::CustomButton::BS_HOT)); 148 views::CustomButton::BS_HOT));
149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon( 149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon(
150 views::CustomButton::BS_PUSHED)); 150 views::CustomButton::BS_PUSHED));
151 } 151 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698