| 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/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" | 34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" |
| 35 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 35 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 36 #import "chrome/browser/ui/cocoa/event_utils.h" | 36 #import "chrome/browser/ui/cocoa/event_utils.h" |
| 37 #import "chrome/browser/ui/cocoa/fullscreen_controller.h" | 37 #import "chrome/browser/ui/cocoa/fullscreen_controller.h" |
| 38 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" | 38 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" |
| 39 #import "chrome/browser/ui/cocoa/menu_button.h" | 39 #import "chrome/browser/ui/cocoa/menu_button.h" |
| 40 #import "chrome/browser/ui/cocoa/themed_window.h" | 40 #import "chrome/browser/ui/cocoa/themed_window.h" |
| 41 #import "chrome/browser/ui/cocoa/toolbar_controller.h" | 41 #import "chrome/browser/ui/cocoa/toolbar_controller.h" |
| 42 #import "chrome/browser/ui/cocoa/view_id_util.h" | 42 #import "chrome/browser/ui/cocoa/view_id_util.h" |
| 43 #import "chrome/browser/ui/cocoa/view_resizer.h" | 43 #import "chrome/browser/ui/cocoa/view_resizer.h" |
| 44 #include "chrome/common/pref_names.h" | |
| 45 #include "grit/app_resources.h" | 44 #include "grit/app_resources.h" |
| 46 #include "grit/generated_resources.h" | 45 #include "grit/generated_resources.h" |
| 47 #include "grit/theme_resources.h" | 46 #include "grit/theme_resources.h" |
| 48 #include "skia/ext/skia_utils_mac.h" | 47 #include "skia/ext/skia_utils_mac.h" |
| 49 | 48 |
| 50 // Bookmark bar state changing and animations | 49 // Bookmark bar state changing and animations |
| 51 // | 50 // |
| 52 // The bookmark bar has three real states: "showing" (a normal bar attached to | 51 // The bookmark bar has three real states: "showing" (a normal bar attached to |
| 53 // the toolbar), "hidden", and "detached" (pretending to be part of the web | 52 // the toolbar), "hidden", and "detached" (pretending to be part of the web |
| 54 // content on the NTP). It can, or at least should be able to, animate between | 53 // content on the NTP). It can, or at least should be able to, animate between |
| (...skipping 2433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2488 // to minimize touching the object passed in (likely a mock). | 2487 // to minimize touching the object passed in (likely a mock). |
| 2489 - (void)setButtonContextMenu:(id)menu { | 2488 - (void)setButtonContextMenu:(id)menu { |
| 2490 buttonContextMenu_ = menu; | 2489 buttonContextMenu_ = menu; |
| 2491 } | 2490 } |
| 2492 | 2491 |
| 2493 - (void)setIgnoreAnimations:(BOOL)ignore { | 2492 - (void)setIgnoreAnimations:(BOOL)ignore { |
| 2494 ignoreAnimations_ = ignore; | 2493 ignoreAnimations_ = ignore; |
| 2495 } | 2494 } |
| 2496 | 2495 |
| 2497 @end | 2496 @end |
| OLD | NEW |