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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.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) 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 10 matching lines...) Expand all
21 #include "chrome/browser/ui/bookmarks/bookmark_editor.h" 21 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
22 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 22 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
23 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
24 #include "chrome/browser/ui/browser_list.h" 24 #include "chrome/browser/ui/browser_list.h"
25 #include "chrome/browser/ui/chrome_pages.h" 25 #include "chrome/browser/ui/chrome_pages.h"
26 #import "chrome/browser/ui/cocoa/background_gradient_view.h" 26 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h" 27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" 28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
29 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" 29 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
30 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" 30 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
31 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" 31 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
32 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 32 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
33 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 33 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h" 34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"
35 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 35 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
36 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 36 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
37 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 37 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
38 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 38 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
39 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 39 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
40 #import "chrome/browser/ui/cocoa/menu_button.h" 40 #import "chrome/browser/ui/cocoa/menu_button.h"
41 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 41 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
(...skipping 2771 matching lines...) Expand 10 before | Expand all | Expand 10 after
2813 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 2813 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
2814 (const BookmarkNode*)node { 2814 (const BookmarkNode*)node {
2815 // See if it's in the bar, then if it is in the hierarchy of visible 2815 // See if it's in the bar, then if it is in the hierarchy of visible
2816 // folder menus. 2816 // folder menus.
2817 if (bookmarkModel_->bookmark_bar_node() == node) 2817 if (bookmarkModel_->bookmark_bar_node() == node)
2818 return self; 2818 return self;
2819 return [folderController_ controllerForNode:node]; 2819 return [folderController_ controllerForNode:node];
2820 } 2820 }
2821 2821
2822 @end 2822 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698