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

Side by Side Diff: chrome/browser/ui/views/browser_action_view.cc

Issue 14307023: chrome: Use base::MessageLoop. (Part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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/views/browser_action_view.h" 5 #include "chrome/browser/ui/views/browser_action_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/extensions/api/commands/command_service.h" 8 #include "chrome/browser/extensions/api/commands/command_service.h"
9 #include "chrome/browser/extensions/extension_action.h" 9 #include "chrome/browser/extensions/extension_action.h"
10 #include "chrome/browser/extensions/extension_action_manager.h" 10 #include "chrome/browser/extensions/extension_action_manager.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 notification_source); 134 notification_source);
135 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED, 135 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
136 notification_source); 136 notification_source);
137 } 137 }
138 138
139 void BrowserActionButton::Destroy() { 139 void BrowserActionButton::Destroy() {
140 MaybeUnregisterExtensionCommand(false); 140 MaybeUnregisterExtensionCommand(false);
141 141
142 if (context_menu_) { 142 if (context_menu_) {
143 context_menu_->Cancel(); 143 context_menu_->Cancel();
144 MessageLoop::current()->DeleteSoon(FROM_HERE, this); 144 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
145 } else { 145 } else {
146 delete this; 146 delete this;
147 } 147 }
148 } 148 }
149 149
150 void BrowserActionButton::ViewHierarchyChanged( 150 void BrowserActionButton::ViewHierarchyChanged(
151 bool is_add, View* parent, View* child) { 151 bool is_add, View* parent, View* child) {
152 152
153 if (is_add && !called_registered_extension_command_ && GetFocusManager()) { 153 if (is_add && !called_registered_extension_command_ && GetFocusManager()) {
154 MaybeRegisterExtensionCommand(); 154 MaybeRegisterExtensionCommand();
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 extensions::Command browser_action_command; 403 extensions::Command browser_action_command;
404 if (!only_if_active || !command_service->GetBrowserActionCommand( 404 if (!only_if_active || !command_service->GetBrowserActionCommand(
405 extension_->id(), 405 extension_->id(),
406 extensions::CommandService::ACTIVE_ONLY, 406 extensions::CommandService::ACTIVE_ONLY,
407 &browser_action_command, 407 &browser_action_command,
408 NULL)) { 408 NULL)) {
409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); 409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
410 keybinding_.reset(NULL); 410 keybinding_.reset(NULL);
411 } 411 }
412 } 412 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698