| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #import "base/mac/bundle_locations.h" | 9 #import "base/mac/bundle_locations.h" |
| 10 #import "base/mac/foundation_util.h" | 10 #import "base/mac/foundation_util.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #include "ui/base/clipboard/clipboard_util_mac.h" | 69 #include "ui/base/clipboard/clipboard_util_mac.h" |
| 70 #import "ui/base/cocoa/cocoa_base_utils.h" | 70 #import "ui/base/cocoa/cocoa_base_utils.h" |
| 71 #import "ui/base/cocoa/nsview_additions.h" | 71 #import "ui/base/cocoa/nsview_additions.h" |
| 72 #include "ui/base/l10n/l10n_util_mac.h" | 72 #include "ui/base/l10n/l10n_util_mac.h" |
| 73 #include "ui/base/material_design/material_design_controller.h" | 73 #include "ui/base/material_design/material_design_controller.h" |
| 74 #include "ui/base/resource/resource_bundle.h" | 74 #include "ui/base/resource/resource_bundle.h" |
| 75 #include "ui/gfx/color_palette.h" | 75 #include "ui/gfx/color_palette.h" |
| 76 #include "ui/gfx/image/image.h" | 76 #include "ui/gfx/image/image.h" |
| 77 #include "ui/gfx/image/image_skia_util_mac.h" | 77 #include "ui/gfx/image/image_skia_util_mac.h" |
| 78 #include "ui/gfx/paint_vector_icon.h" | 78 #include "ui/gfx/paint_vector_icon.h" |
| 79 #include "ui/resources/grit/ui_resources.h" | |
| 80 | 79 |
| 81 using base::UserMetricsAction; | 80 using base::UserMetricsAction; |
| 82 using bookmarks::BookmarkBarLayout; | 81 using bookmarks::BookmarkBarLayout; |
| 83 using bookmarks::BookmarkModel; | 82 using bookmarks::BookmarkModel; |
| 84 using bookmarks::BookmarkNode; | 83 using bookmarks::BookmarkNode; |
| 85 using bookmarks::BookmarkNodeData; | 84 using bookmarks::BookmarkNodeData; |
| 86 using content::OpenURLParams; | 85 using content::OpenURLParams; |
| 87 using content::Referrer; | 86 using content::Referrer; |
| 88 using content::WebContents; | 87 using content::WebContents; |
| 89 | 88 |
| (...skipping 2595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2685 return self; | 2684 return self; |
| 2686 return [folderController_ controllerForNode:node]; | 2685 return [folderController_ controllerForNode:node]; |
| 2687 } | 2686 } |
| 2688 | 2687 |
| 2689 // For testing. | 2688 // For testing. |
| 2690 - (const BookmarkBarLayout&)currentLayout { | 2689 - (const BookmarkBarLayout&)currentLayout { |
| 2691 return layout_; | 2690 return layout_; |
| 2692 } | 2691 } |
| 2693 | 2692 |
| 2694 @end | 2693 @end |
| OLD | NEW |