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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 8 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
OLDNEW
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"
11 #include "base/mac/mac_util.h" 11 #include "base/mac/mac_util.h"
12 #import "base/mac/sdk_forward_declarations.h" 12 #import "base/mac/sdk_forward_declarations.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/user_metrics.h"
14 #include "base/strings/sys_string_conversions.h" 15 #include "base/strings/sys_string_conversions.h"
15 #include "chrome/app/vector_icons/vector_icons.h" 16 #include "chrome/app/vector_icons/vector_icons.h"
16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 17 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
17 #include "chrome/browser/bookmarks/bookmark_stats.h" 18 #include "chrome/browser/bookmarks/bookmark_stats.h"
18 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 19 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
19 #include "chrome/browser/prefs/incognito_mode_prefs.h" 20 #include "chrome/browser/prefs/incognito_mode_prefs.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/themes/theme_properties.h" 22 #include "chrome/browser/themes/theme_properties.h"
22 #include "chrome/browser/themes/theme_service.h" 23 #include "chrome/browser/themes/theme_service.h"
23 #import "chrome/browser/themes/theme_service_factory.h" 24 #import "chrome/browser/themes/theme_service_factory.h"
(...skipping 29 matching lines...) Expand all
53 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
54 #include "chrome/grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
55 #include "chrome/grit/theme_resources.h" 56 #include "chrome/grit/theme_resources.h"
56 #include "components/bookmarks/browser/bookmark_model.h" 57 #include "components/bookmarks/browser/bookmark_model.h"
57 #include "components/bookmarks/browser/bookmark_node_data.h" 58 #include "components/bookmarks/browser/bookmark_node_data.h"
58 #include "components/bookmarks/browser/bookmark_utils.h" 59 #include "components/bookmarks/browser/bookmark_utils.h"
59 #include "components/bookmarks/common/bookmark_pref_names.h" 60 #include "components/bookmarks/common/bookmark_pref_names.h"
60 #include "components/bookmarks/managed/managed_bookmark_service.h" 61 #include "components/bookmarks/managed/managed_bookmark_service.h"
61 #include "components/omnibox/browser/vector_icons.h" 62 #include "components/omnibox/browser/vector_icons.h"
62 #include "components/prefs/pref_service.h" 63 #include "components/prefs/pref_service.h"
63 #include "content/public/browser/user_metrics.h"
64 #include "content/public/browser/web_contents.h" 64 #include "content/public/browser/web_contents.h"
65 #include "extensions/browser/extension_registry.h" 65 #include "extensions/browser/extension_registry.h"
66 #include "extensions/common/extension.h" 66 #include "extensions/common/extension.h"
67 #include "extensions/common/extension_set.h" 67 #include "extensions/common/extension_set.h"
68 #include "ui/base/clipboard/clipboard_util_mac.h" 68 #include "ui/base/clipboard/clipboard_util_mac.h"
69 #import "ui/base/cocoa/cocoa_base_utils.h" 69 #import "ui/base/cocoa/cocoa_base_utils.h"
70 #import "ui/base/cocoa/nsview_additions.h" 70 #import "ui/base/cocoa/nsview_additions.h"
71 #include "ui/base/l10n/l10n_util_mac.h" 71 #include "ui/base/l10n/l10n_util_mac.h"
72 #include "ui/base/material_design/material_design_controller.h" 72 #include "ui/base/material_design/material_design_controller.h"
73 #include "ui/base/resource/resource_bundle.h" 73 #include "ui/base/resource/resource_bundle.h"
(...skipping 2879 matching lines...) Expand 10 before | Expand all | Expand 10 after
2953 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 2953 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
2954 (const BookmarkNode*)node { 2954 (const BookmarkNode*)node {
2955 // See if it's in the bar, then if it is in the hierarchy of visible 2955 // See if it's in the bar, then if it is in the hierarchy of visible
2956 // folder menus. 2956 // folder menus.
2957 if (bookmarkModel_->bookmark_bar_node() == node) 2957 if (bookmarkModel_->bookmark_bar_node() == node)
2958 return self; 2958 return self;
2959 return [folderController_ controllerForNode:node]; 2959 return [folderController_ controllerForNode:node];
2960 } 2960 }
2961 2961
2962 @end 2962 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698