| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/toolbar/toolbar_button.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 // Exit if the model is null. | 208 // Exit if the model is null. |
| 209 if (!model_.get()) | 209 if (!model_.get()) |
| 210 return; | 210 return; |
| 211 | 211 |
| 212 // Create and run menu. | 212 // Create and run menu. |
| 213 menu_model_adapter_.reset(new views::MenuModelAdapter( | 213 menu_model_adapter_.reset(new views::MenuModelAdapter( |
| 214 model_.get(), | 214 model_.get(), |
| 215 base::Bind(&ToolbarButton::OnMenuClosed, base::Unretained(this)))); | 215 base::Bind(&ToolbarButton::OnMenuClosed, base::Unretained(this)))); |
| 216 menu_model_adapter_->set_triggerable_event_flags(triggerable_event_flags()); | 216 menu_model_adapter_->set_triggerable_event_flags(triggerable_event_flags()); |
| 217 menu_runner_.reset(new views::MenuRunner( | 217 menu_runner_.reset(new views::MenuRunner(menu_model_adapter_->CreateMenu(), |
| 218 menu_model_adapter_->CreateMenu(), | 218 views::MenuRunner::HAS_MNEMONICS)); |
| 219 views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::ASYNC)); | 219 menu_runner_->RunMenuAt(GetWidget(), nullptr, |
| 220 ignore_result(menu_runner_->RunMenuAt( | 220 gfx::Rect(menu_position, gfx::Size(0, 0)), |
| 221 GetWidget(), nullptr, gfx::Rect(menu_position, gfx::Size(0, 0)), | 221 views::MENU_ANCHOR_TOPLEFT, source_type); |
| 222 views::MENU_ANCHOR_TOPLEFT, source_type)); | |
| 223 } | 222 } |
| 224 | 223 |
| 225 void ToolbarButton::OnMenuClosed() { | 224 void ToolbarButton::OnMenuClosed() { |
| 226 AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */); | 225 AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */); |
| 227 | 226 |
| 228 menu_showing_ = false; | 227 menu_showing_ = false; |
| 229 | 228 |
| 230 // Set the state back to normal after the drop down menu is closed. | 229 // Set the state back to normal after the drop down menu is closed. |
| 231 if (state() != STATE_DISABLED) | 230 if (state() != STATE_DISABLED) |
| 232 SetState(STATE_NORMAL); | 231 SetState(STATE_NORMAL); |
| 233 | 232 |
| 234 menu_runner_.reset(); | 233 menu_runner_.reset(); |
| 235 menu_model_adapter_.reset(); | 234 menu_model_adapter_.reset(); |
| 236 } | 235 } |
| 237 | 236 |
| 238 const char* ToolbarButton::GetClassName() const { | 237 const char* ToolbarButton::GetClassName() const { |
| 239 return "ToolbarButton"; | 238 return "ToolbarButton"; |
| 240 } | 239 } |
| OLD | NEW |