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

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

Issue 160083003: Split cocoa_event_utils in two parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: still works? Created 6 years, 10 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
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 "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 48 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
49 #include "chrome/common/extensions/extension_constants.h" 49 #include "chrome/common/extensions/extension_constants.h"
50 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
51 #include "chrome/common/url_constants.h" 51 #include "chrome/common/url_constants.h"
52 #include "content/public/browser/user_metrics.h" 52 #include "content/public/browser/user_metrics.h"
53 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
54 #include "content/public/browser/web_contents_view.h" 54 #include "content/public/browser/web_contents_view.h"
55 #include "grit/generated_resources.h" 55 #include "grit/generated_resources.h"
56 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
57 #include "grit/ui_resources.h" 57 #include "grit/ui_resources.h"
58 #import "ui/base/cocoa/cocoa_event_utils.h" 58 #import "ui/base/cocoa/cocoa_base_utils.h"
59 #include "ui/base/l10n/l10n_util_mac.h" 59 #include "ui/base/l10n/l10n_util_mac.h"
60 #include "ui/base/resource/resource_bundle.h" 60 #include "ui/base/resource/resource_bundle.h"
61 #include "ui/gfx/image/image.h" 61 #include "ui/gfx/image/image.h"
62 62
63 using base::UserMetricsAction; 63 using base::UserMetricsAction;
64 using content::OpenURLParams; 64 using content::OpenURLParams;
65 using content::Referrer; 65 using content::Referrer;
66 using content::WebContents; 66 using content::WebContents;
67 67
68 // Bookmark bar state changing and animations 68 // Bookmark bar state changing and animations
(...skipping 2605 matching lines...) Expand 10 before | Expand all | Expand 10 after
2674 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 2674 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
2675 (const BookmarkNode*)node { 2675 (const BookmarkNode*)node {
2676 // See if it's in the bar, then if it is in the hierarchy of visible 2676 // See if it's in the bar, then if it is in the hierarchy of visible
2677 // folder menus. 2677 // folder menus.
2678 if (bookmarkModel_->bookmark_bar_node() == node) 2678 if (bookmarkModel_->bookmark_bar_node() == node)
2679 return self; 2679 return self;
2680 return [folderController_ controllerForNode:node]; 2680 return [folderController_ controllerForNode:node];
2681 } 2681 }
2682 2682
2683 @end 2683 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/accelerators_cocoa.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698