| 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 "chrome/browser/views/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/drag_drop_types.h" | 9 #include "app/drag_drop_types.h" |
| 10 #include "app/gfx/chrome_canvas.h" | 10 #include "app/gfx/chrome_canvas.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "chrome/browser/views/go_button.h" | 30 #include "chrome/browser/views/go_button.h" |
| 31 #include "chrome/browser/views/location_bar_view.h" | 31 #include "chrome/browser/views/location_bar_view.h" |
| 32 #include "chrome/browser/views/theme_helpers.h" | 32 #include "chrome/browser/views/theme_helpers.h" |
| 33 #include "chrome/browser/views/toolbar_star_toggle.h" | 33 #include "chrome/browser/views/toolbar_star_toggle.h" |
| 34 #include "chrome/browser/view_ids.h" | 34 #include "chrome/browser/view_ids.h" |
| 35 #include "chrome/common/chrome_constants.h" | 35 #include "chrome/common/chrome_constants.h" |
| 36 #include "chrome/common/chrome_switches.h" | 36 #include "chrome/common/chrome_switches.h" |
| 37 #include "chrome/common/notification_service.h" | 37 #include "chrome/common/notification_service.h" |
| 38 #include "chrome/common/pref_names.h" | 38 #include "chrome/common/pref_names.h" |
| 39 #include "chrome/common/pref_service.h" | 39 #include "chrome/common/pref_service.h" |
| 40 #include "chrome/common/win_util.h" | |
| 41 #ifdef CHROME_PERSONALIZATION | 40 #ifdef CHROME_PERSONALIZATION |
| 42 #include "chrome/personalization/personalization.h" | 41 #include "chrome/personalization/personalization.h" |
| 43 #endif | 42 #endif |
| 44 #include "grit/chromium_strings.h" | 43 #include "grit/chromium_strings.h" |
| 45 #include "grit/generated_resources.h" | 44 #include "grit/generated_resources.h" |
| 46 #include "grit/theme_resources.h" | 45 #include "grit/theme_resources.h" |
| 47 #include "net/base/net_util.h" | 46 #include "net/base/net_util.h" |
| 48 #include "views/background.h" | 47 #include "views/background.h" |
| 49 #include "views/controls/button/button_dropdown.h" | 48 #include "views/controls/button/button_dropdown.h" |
| 50 #include "views/controls/hwnd_view.h" | 49 #include "views/controls/hwnd_view.h" |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 case IDC_COPY: | 916 case IDC_COPY: |
| 918 *accel = views::Accelerator(L'C', false, true, false); | 917 *accel = views::Accelerator(L'C', false, true, false); |
| 919 return true; | 918 return true; |
| 920 case IDC_PASTE: | 919 case IDC_PASTE: |
| 921 *accel = views::Accelerator(L'V', false, true, false); | 920 *accel = views::Accelerator(L'V', false, true, false); |
| 922 return true; | 921 return true; |
| 923 } | 922 } |
| 924 // Else, we retrieve the accelerator information from the frame. | 923 // Else, we retrieve the accelerator information from the frame. |
| 925 return GetWidget()->GetAccelerator(id, accel); | 924 return GetWidget()->GetAccelerator(id, accel); |
| 926 } | 925 } |
| OLD | NEW |