| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/cocoa/location_bar_view_mac.h" | 5 #import "chrome/browser/cocoa/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/nsimage_cache_mac.h" | 10 #include "base/nsimage_cache_mac.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "chrome/browser/tab_contents/navigation_entry.h" | 34 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 35 #include "chrome/browser/tab_contents/tab_contents.h" | 35 #include "chrome/browser/tab_contents/tab_contents.h" |
| 36 #include "chrome/common/extensions/extension.h" | 36 #include "chrome/common/extensions/extension.h" |
| 37 #include "chrome/common/extensions/extension_action.h" | 37 #include "chrome/common/extensions/extension_action.h" |
| 38 #include "chrome/common/notification_service.h" | 38 #include "chrome/common/notification_service.h" |
| 39 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
| 40 #include "net/base/net_util.h" | 40 #include "net/base/net_util.h" |
| 41 #include "grit/generated_resources.h" | 41 #include "grit/generated_resources.h" |
| 42 #include "grit/theme_resources.h" | 42 #include "grit/theme_resources.h" |
| 43 #include "skia/ext/skia_utils_mac.h" | 43 #include "skia/ext/skia_utils_mac.h" |
| 44 #import "third_party/mozilla/include/NSPasteboard+Utils.h" | 44 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 45 | 45 |
| 46 | 46 |
| 47 // TODO(shess): This code is mostly copied from the gtk | 47 // TODO(shess): This code is mostly copied from the gtk |
| 48 // implementation. Make sure it's all appropriate and flesh it out. | 48 // implementation. Make sure it's all appropriate and flesh it out. |
| 49 | 49 |
| 50 namespace { | 50 namespace { |
| 51 | 51 |
| 52 // Returns the short name for a keyword. | 52 // Returns the short name for a keyword. |
| 53 // TODO(shess): Copied from views/location_bar_view.cc. Try to share | 53 // TODO(shess): Copied from views/location_bar_view.cc. Try to share |
| 54 // it. | 54 // it. |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 ++result; | 1012 ++result; |
| 1013 } | 1013 } |
| 1014 return result; | 1014 return result; |
| 1015 } | 1015 } |
| 1016 | 1016 |
| 1017 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, | 1017 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, |
| 1018 size_t index) { | 1018 size_t index) { |
| 1019 ViewAt(index)->OnMousePressed(iconFrame); | 1019 ViewAt(index)->OnMousePressed(iconFrame); |
| 1020 } | 1020 } |
| 1021 | 1021 |
| OLD | NEW |