| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 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/views/wrench_menu.h" | 5 #include "chrome/browser/ui/views/wrench_menu.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| 11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/tab_contents/tab_contents.h" | 15 #include "chrome/browser/tab_contents/tab_contents.h" |
| (...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 } | 703 } |
| 704 | 704 |
| 705 return menu_item; | 705 return menu_item; |
| 706 } | 706 } |
| 707 | 707 |
| 708 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) { | 708 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) { |
| 709 selected_menu_model_ = model; | 709 selected_menu_model_ = model; |
| 710 selected_index_ = index; | 710 selected_index_ = index; |
| 711 root_->Cancel(); | 711 root_->Cancel(); |
| 712 } | 712 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6204002:
Carnitas: Remove chrome/browser/views, update references. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src