Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/bug_report_window_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.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/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/metrics/user_metrics.h" 14 #include "chrome/browser/metrics/user_metrics.h"
15 #include "chrome/browser/prefs/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/tab_contents/tab_contents.h"
18 #include "chrome/browser/tab_contents/tab_contents_view.h"
19 #import "chrome/browser/themes/browser_theme_provider.h" 17 #import "chrome/browser/themes/browser_theme_provider.h"
20 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_list.h" 19 #include "chrome/browser/ui/browser_list.h"
22 #import "chrome/browser/ui/cocoa/background_gradient_view.h" 20 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
23 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h" 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
24 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
25 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" 23 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" 24 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" 25 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
29 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
30 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
31 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 29 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
32 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" 30 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
33 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 31 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 32 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
35 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 33 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
36 #import "chrome/browser/ui/cocoa/event_utils.h" 34 #import "chrome/browser/ui/cocoa/event_utils.h"
37 #import "chrome/browser/ui/cocoa/fullscreen_controller.h" 35 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
38 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h" 36 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
39 #import "chrome/browser/ui/cocoa/menu_button.h" 37 #import "chrome/browser/ui/cocoa/menu_button.h"
40 #import "chrome/browser/ui/cocoa/themed_window.h" 38 #import "chrome/browser/ui/cocoa/themed_window.h"
41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
42 #import "chrome/browser/ui/cocoa/view_id_util.h" 40 #import "chrome/browser/ui/cocoa/view_id_util.h"
43 #import "chrome/browser/ui/cocoa/view_resizer.h" 41 #import "chrome/browser/ui/cocoa/view_resizer.h"
44 #include "chrome/common/extensions/extension_constants.h" 42 #include "chrome/common/extensions/extension_constants.h"
45 #include "chrome/common/pref_names.h" 43 #include "chrome/common/pref_names.h"
44 #include "content/browser/tab_contents/tab_contents.h"
45 #include "content/browser/tab_contents/tab_contents_view.h"
46 #include "grit/app_resources.h" 46 #include "grit/app_resources.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 #include "grit/theme_resources.h" 48 #include "grit/theme_resources.h"
49 #include "skia/ext/skia_utils_mac.h" 49 #include "skia/ext/skia_utils_mac.h"
50 #include "ui/base/l10n/l10n_util_mac.h" 50 #include "ui/base/l10n/l10n_util_mac.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/gfx/image.h" 52 #include "ui/gfx/image.h"
53 53
54 // Bookmark bar state changing and animations 54 // Bookmark bar state changing and animations
55 // 55 //
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 // to minimize touching the object passed in (likely a mock). 2520 // to minimize touching the object passed in (likely a mock).
2521 - (void)setButtonContextMenu:(id)menu { 2521 - (void)setButtonContextMenu:(id)menu {
2522 buttonContextMenu_ = menu; 2522 buttonContextMenu_ = menu;
2523 } 2523 }
2524 2524
2525 - (void)setIgnoreAnimations:(BOOL)ignore { 2525 - (void)setIgnoreAnimations:(BOOL)ignore {
2526 ignoreAnimations_ = ignore; 2526 ignoreAnimations_ = ignore;
2527 } 2527 }
2528 2528
2529 @end 2529 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/bug_report_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698