| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "chrome/browser/controller.h" | 7 #include "chrome/browser/controller.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 | 9 |
| 10 bool g_threedee_enabled = false; |
| 11 |
| 10 CommandController::CommandController(CommandHandler* handler) : | 12 CommandController::CommandController(CommandHandler* handler) : |
| 11 handler_(handler) { | 13 handler_(handler) { |
| 12 } | 14 } |
| 13 | 15 |
| 14 CommandController::~CommandController() { | 16 CommandController::~CommandController() { |
| 15 // The button controllers are command observers hence this list | 17 // The button controllers are command observers hence this list |
| 16 // must be deleted before the commands below. | 18 // must be deleted before the commands below. |
| 17 std::vector<ButtonController*>::iterator bc_iter; | 19 std::vector<ButtonController*>::iterator bc_iter; |
| 18 for (bc_iter = managed_button_controllers_.begin(); | 20 for (bc_iter = managed_button_controllers_.begin(); |
| 19 bc_iter != managed_button_controllers_.end(); | 21 bc_iter != managed_button_controllers_.end(); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 | 111 |
| 110 if (existing != end) | 112 if (existing != end) |
| 111 list->erase(existing); | 113 list->erase(existing); |
| 112 } | 114 } |
| 113 | 115 |
| 114 void CommandController::AddManagedButton(views::Button* b, int command) { | 116 void CommandController::AddManagedButton(views::Button* b, int command) { |
| 115 ButtonController* bc = new ButtonController(b, this, command); | 117 ButtonController* bc = new ButtonController(b, this, command); |
| 116 managed_button_controllers_.push_back(bc); | 118 managed_button_controllers_.push_back(bc); |
| 117 } | 119 } |
| 118 | 120 |
| OLD | NEW |