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

Side by Side Diff: ui/base/models/simple_menu_model.cc

Issue 14061025: ui: Use base::MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« no previous file with comments | « ui/base/ime/win/tsf_bridge.cc ('k') | ui/base/x/selection_requestor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/models/simple_menu_model.h" 5 #include "ui/base/models/simple_menu_model.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/gfx/image/image.h" 10 #include "ui/gfx/image/image.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 353
354 void SimpleMenuModel::MenuWillShow() { 354 void SimpleMenuModel::MenuWillShow() {
355 if (delegate_) 355 if (delegate_)
356 delegate_->MenuWillShow(this); 356 delegate_->MenuWillShow(this);
357 } 357 }
358 358
359 void SimpleMenuModel::MenuClosed() { 359 void SimpleMenuModel::MenuClosed() {
360 // Due to how menus work on the different platforms, ActivatedAt will be 360 // Due to how menus work on the different platforms, ActivatedAt will be
361 // called after this. It's more convenient for the delegate to be called 361 // called after this. It's more convenient for the delegate to be called
362 // afterwards though, so post a task. 362 // afterwards though, so post a task.
363 MessageLoop::current()->PostTask( 363 base::MessageLoop::current()->PostTask(
364 FROM_HERE, 364 FROM_HERE,
365 base::Bind(&SimpleMenuModel::OnMenuClosed, method_factory_.GetWeakPtr())); 365 base::Bind(&SimpleMenuModel::OnMenuClosed, method_factory_.GetWeakPtr()));
366 } 366 }
367 367
368 void SimpleMenuModel::SetMenuModelDelegate( 368 void SimpleMenuModel::SetMenuModelDelegate(
369 ui::MenuModelDelegate* menu_model_delegate) { 369 ui::MenuModelDelegate* menu_model_delegate) {
370 menu_model_delegate_ = menu_model_delegate; 370 menu_model_delegate_ = menu_model_delegate;
371 } 371 }
372 372
373 MenuModelDelegate* SimpleMenuModel::GetMenuModelDelegate() const { 373 MenuModelDelegate* SimpleMenuModel::GetMenuModelDelegate() const {
(...skipping 28 matching lines...) Expand all
402 #ifndef NDEBUG 402 #ifndef NDEBUG
403 if (item.type == TYPE_SEPARATOR) { 403 if (item.type == TYPE_SEPARATOR) {
404 DCHECK_EQ(item.command_id, kSeparatorId); 404 DCHECK_EQ(item.command_id, kSeparatorId);
405 } else { 405 } else {
406 DCHECK_GE(item.command_id, 0); 406 DCHECK_GE(item.command_id, 0);
407 } 407 }
408 #endif // NDEBUG 408 #endif // NDEBUG
409 } 409 }
410 410
411 } // namespace ui 411 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/win/tsf_bridge.cc ('k') | ui/base/x/selection_requestor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698