| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
| 8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
| 52 #include "content/public/browser/user_metrics.h" | 52 #include "content/public/browser/user_metrics.h" |
| 53 #include "content/public/browser/web_contents.h" | 53 #include "content/public/browser/web_contents.h" |
| 54 #include "content/public/browser/web_contents_view.h" | 54 #include "content/public/browser/web_contents_view.h" |
| 55 #include "grit/generated_resources.h" | 55 #include "grit/generated_resources.h" |
| 56 #include "grit/theme_resources.h" | 56 #include "grit/theme_resources.h" |
| 57 #include "grit/ui_resources.h" | 57 #include "grit/ui_resources.h" |
| 58 #include "ui/base/l10n/l10n_util_mac.h" | 58 #include "ui/base/l10n/l10n_util_mac.h" |
| 59 #include "ui/base/resource/resource_bundle.h" | 59 #include "ui/base/resource/resource_bundle.h" |
| 60 #include "ui/gfx/image/image.h" | 60 #include "ui/gfx/image/image.h" |
| 61 #include "ui/gfx/mac/nsimage_cache.h" | |
| 62 | 61 |
| 63 using content::OpenURLParams; | 62 using content::OpenURLParams; |
| 64 using content::Referrer; | 63 using content::Referrer; |
| 65 using content::UserMetricsAction; | 64 using content::UserMetricsAction; |
| 66 using content::WebContents; | 65 using content::WebContents; |
| 67 | 66 |
| 68 // Bookmark bar state changing and animations | 67 // Bookmark bar state changing and animations |
| 69 // | 68 // |
| 70 // The bookmark bar has three real states: "showing" (a normal bar attached to | 69 // The bookmark bar has three real states: "showing" (a normal bar attached to |
| 71 // the toolbar), "hidden", and "detached" (pretending to be part of the web | 70 // the toolbar), "hidden", and "detached" (pretending to be part of the web |
| (...skipping 2764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2836 return buttonContextMenu_; | 2835 return buttonContextMenu_; |
| 2837 } | 2836 } |
| 2838 | 2837 |
| 2839 // Intentionally ignores ownership issues; used for testing and we try | 2838 // Intentionally ignores ownership issues; used for testing and we try |
| 2840 // to minimize touching the object passed in (likely a mock). | 2839 // to minimize touching the object passed in (likely a mock). |
| 2841 - (void)setButtonContextMenu:(id)menu { | 2840 - (void)setButtonContextMenu:(id)menu { |
| 2842 buttonContextMenu_ = menu; | 2841 buttonContextMenu_ = menu; |
| 2843 } | 2842 } |
| 2844 | 2843 |
| 2845 @end | 2844 @end |
| OLD | NEW |