| 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/bookmark_bar_controller.h" | 5 #import "chrome/browser/cocoa/bookmark_bar_controller.h" |
| 6 #include "app/l10n_util_mac.h" | 6 #include "app/l10n_util_mac.h" |
| 7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
| 8 #include "base/mac_util.h" | 8 #include "base/mac_util.h" |
| 9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_editor.h" | 10 #include "chrome/browser/bookmarks/bookmark_editor.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 13 #include "chrome/browser/browser.h" | 13 #include "chrome/browser/browser.h" |
| 14 #include "chrome/browser/browser_list.h" | 14 #include "chrome/browser/browser_list.h" |
| 15 #import "chrome/browser/browser_theme_provider.h" | |
| 16 #import "chrome/browser/cocoa/background_gradient_view.h" | 15 #import "chrome/browser/cocoa/background_gradient_view.h" |
| 17 #import "chrome/browser/cocoa/bookmark_bar_bridge.h" | 16 #import "chrome/browser/cocoa/bookmark_bar_bridge.h" |
| 18 #import "chrome/browser/cocoa/bookmark_bar_constants.h" | 17 #import "chrome/browser/cocoa/bookmark_bar_constants.h" |
| 19 #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" | 18 #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" |
| 20 #import "chrome/browser/cocoa/bookmark_bar_folder_window.h" | 19 #import "chrome/browser/cocoa/bookmark_bar_folder_window.h" |
| 21 #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" | 20 #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" |
| 22 #import "chrome/browser/cocoa/bookmark_bar_view.h" | 21 #import "chrome/browser/cocoa/bookmark_bar_view.h" |
| 23 #import "chrome/browser/cocoa/bookmark_button.h" | 22 #import "chrome/browser/cocoa/bookmark_button.h" |
| 24 #import "chrome/browser/cocoa/bookmark_button_cell.h" | 23 #import "chrome/browser/cocoa/bookmark_button_cell.h" |
| 25 #import "chrome/browser/cocoa/bookmark_editor_controller.h" | 24 #import "chrome/browser/cocoa/bookmark_editor_controller.h" |
| 26 #import "chrome/browser/cocoa/bookmark_folder_target.h" | 25 #import "chrome/browser/cocoa/bookmark_folder_target.h" |
| 27 #import "chrome/browser/cocoa/bookmark_menu.h" | 26 #import "chrome/browser/cocoa/bookmark_menu.h" |
| 28 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" | 27 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" |
| 29 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h" | 28 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h" |
| 30 #import "chrome/browser/cocoa/browser_window_controller.h" | 29 #import "chrome/browser/cocoa/browser_window_controller.h" |
| 31 #import "chrome/browser/cocoa/event_utils.h" | 30 #import "chrome/browser/cocoa/event_utils.h" |
| 32 #import "chrome/browser/cocoa/fullscreen_controller.h" | 31 #import "chrome/browser/cocoa/fullscreen_controller.h" |
| 33 #import "chrome/browser/cocoa/import_settings_dialog.h" | 32 #import "chrome/browser/cocoa/import_settings_dialog.h" |
| 34 #import "chrome/browser/cocoa/menu_button.h" | 33 #import "chrome/browser/cocoa/menu_button.h" |
| 35 #import "chrome/browser/cocoa/themed_window.h" | 34 #import "chrome/browser/cocoa/themed_window.h" |
| 36 #import "chrome/browser/cocoa/toolbar_controller.h" | 35 #import "chrome/browser/cocoa/toolbar_controller.h" |
| 37 #import "chrome/browser/cocoa/view_id_util.h" | 36 #import "chrome/browser/cocoa/view_id_util.h" |
| 38 #import "chrome/browser/cocoa/view_resizer.h" | 37 #import "chrome/browser/cocoa/view_resizer.h" |
| 39 #include "chrome/browser/metrics/user_metrics.h" | 38 #include "chrome/browser/metrics/user_metrics.h" |
| 40 #include "chrome/browser/pref_service.h" | 39 #include "chrome/browser/pref_service.h" |
| 41 #include "chrome/browser/profile.h" | 40 #include "chrome/browser/profile.h" |
| 42 #include "chrome/browser/tab_contents/tab_contents.h" | 41 #include "chrome/browser/tab_contents/tab_contents.h" |
| 43 #include "chrome/browser/tab_contents/tab_contents_view.h" | 42 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 43 #import "chrome/browser/themes/browser_theme_provider.h" |
| 44 #include "chrome/common/pref_names.h" | 44 #include "chrome/common/pref_names.h" |
| 45 #include "grit/app_resources.h" | 45 #include "grit/app_resources.h" |
| 46 #include "grit/generated_resources.h" | 46 #include "grit/generated_resources.h" |
| 47 #include "grit/theme_resources.h" | 47 #include "grit/theme_resources.h" |
| 48 #include "skia/ext/skia_utils_mac.h" | 48 #include "skia/ext/skia_utils_mac.h" |
| 49 | 49 |
| 50 // Bookmark bar state changing and animations | 50 // Bookmark bar state changing and animations |
| 51 // | 51 // |
| 52 // The bookmark bar has three real states: "showing" (a normal bar attached to | 52 // 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 | 53 // the toolbar), "hidden", and "detached" (pretending to be part of the web |
| (...skipping 2378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2432 // to minimize touching the object passed in (likely a mock). | 2432 // to minimize touching the object passed in (likely a mock). |
| 2433 - (void)setButtonContextMenu:(id)menu { | 2433 - (void)setButtonContextMenu:(id)menu { |
| 2434 buttonContextMenu_ = menu; | 2434 buttonContextMenu_ = menu; |
| 2435 } | 2435 } |
| 2436 | 2436 |
| 2437 - (void)setIgnoreAnimations:(BOOL)ignore { | 2437 - (void)setIgnoreAnimations:(BOOL)ignore { |
| 2438 ignoreAnimations_ = ignore; | 2438 ignoreAnimations_ = ignore; |
| 2439 } | 2439 } |
| 2440 | 2440 |
| 2441 @end | 2441 @end |
| OLD | NEW |