| OLD | NEW |
| 1 // Copyright (c) 2011 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/ui/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 "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 // left/right of it SchedulePaint on the the button may not be enough, so this | 232 // left/right of it SchedulePaint on the the button may not be enough, so this |
| 233 // forces a paint all. | 233 // forces a paint all. |
| 234 class ScheduleAllView : public views::View { | 234 class ScheduleAllView : public views::View { |
| 235 public: | 235 public: |
| 236 ScheduleAllView() {} | 236 ScheduleAllView() {} |
| 237 | 237 |
| 238 virtual void SchedulePaintInRect(const gfx::Rect& r) { | 238 virtual void SchedulePaintInRect(const gfx::Rect& r) { |
| 239 View::SchedulePaintInRect(gfx::Rect(0, 0, width(), height())); | 239 View::SchedulePaintInRect(gfx::Rect(0, 0, width(), height())); |
| 240 } | 240 } |
| 241 | 241 |
| 242 virtual void SchedulePaintInternal(const gfx::Rect& r) { | |
| 243 View::SchedulePaintInternal(gfx::Rect(0, 0, width(), height())); | |
| 244 } | |
| 245 | |
| 246 private: | 242 private: |
| 247 DISALLOW_COPY_AND_ASSIGN(ScheduleAllView); | 243 DISALLOW_COPY_AND_ASSIGN(ScheduleAllView); |
| 248 }; | 244 }; |
| 249 | 245 |
| 250 string16 GetAccessibleNameForWrenchMenuItem( | 246 string16 GetAccessibleNameForWrenchMenuItem( |
| 251 MenuModel* model, int item_index, int accessible_string_id) { | 247 MenuModel* model, int item_index, int accessible_string_id) { |
| 252 string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id); | 248 string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id); |
| 253 string16 accelerator_text; | 249 string16 accelerator_text; |
| 254 | 250 |
| 255 ui::Accelerator menu_accelerator; | 251 ui::Accelerator menu_accelerator; |
| (...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 browser_->window()->GetNativeHandle()); | 860 browser_->window()->GetNativeHandle()); |
| 865 bookmark_menu_delegate_.reset( | 861 bookmark_menu_delegate_.reset( |
| 866 new BookmarkMenuDelegate(browser_->profile(), | 862 new BookmarkMenuDelegate(browser_->profile(), |
| 867 NULL, | 863 NULL, |
| 868 parent, | 864 parent, |
| 869 first_bookmark_command_id_)); | 865 first_bookmark_command_id_)); |
| 870 bookmark_menu_delegate_->Init( | 866 bookmark_menu_delegate_->Init( |
| 871 this, bookmark_menu_, model->bookmark_bar_node(), 0, | 867 this, bookmark_menu_, model->bookmark_bar_node(), 0, |
| 872 BookmarkMenuDelegate::SHOW_OTHER_FOLDER); | 868 BookmarkMenuDelegate::SHOW_OTHER_FOLDER); |
| 873 } | 869 } |
| OLD | NEW |