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

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

Issue 228393004: Create bookmarks component with names of bookmark preferences (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 "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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 42 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
43 #import "chrome/browser/ui/cocoa/themed_window.h" 43 #import "chrome/browser/ui/cocoa/themed_window.h"
44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
45 #import "chrome/browser/ui/cocoa/view_id_util.h" 45 #import "chrome/browser/ui/cocoa/view_id_util.h"
46 #import "chrome/browser/ui/cocoa/view_resizer.h" 46 #import "chrome/browser/ui/cocoa/view_resizer.h"
47 #include "chrome/browser/ui/tabs/tab_strip_model.h" 47 #include "chrome/browser/ui/tabs/tab_strip_model.h"
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 "components/bookmarks/bookmark_pref_names.h"
52 #include "content/public/browser/user_metrics.h" 53 #include "content/public/browser/user_metrics.h"
53 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
54 #include "content/public/browser/web_contents_view.h" 55 #include "content/public/browser/web_contents_view.h"
55 #include "grit/generated_resources.h" 56 #include "grit/generated_resources.h"
56 #include "grit/theme_resources.h" 57 #include "grit/theme_resources.h"
57 #include "grit/ui_resources.h" 58 #include "grit/ui_resources.h"
58 #import "ui/base/cocoa/cocoa_base_utils.h" 59 #import "ui/base/cocoa/cocoa_base_utils.h"
59 #include "ui/base/l10n/l10n_util_mac.h" 60 #include "ui/base/l10n/l10n_util_mac.h"
60 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
61 #include "ui/gfx/image/image.h" 62 #include "ui/gfx/image/image.h"
(...skipping 2616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 2679 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
2679 (const BookmarkNode*)node { 2680 (const BookmarkNode*)node {
2680 // See if it's in the bar, then if it is in the hierarchy of visible 2681 // See if it's in the bar, then if it is in the hierarchy of visible
2681 // folder menus. 2682 // folder menus.
2682 if (bookmarkModel_->bookmark_bar_node() == node) 2683 if (bookmarkModel_->bookmark_bar_node() == node)
2683 return self; 2684 return self;
2684 return [folderController_ controllerForNode:node]; 2685 return [folderController_ controllerForNode:node];
2685 } 2686 }
2686 2687
2687 @end 2688 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698