chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm ('k') | 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') | Hide Comments ('s')

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 "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 28 matching lines...) Expand all Loading...
39 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"	39 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"

40 #import "chrome/browser/ui/cocoa/themed_window.h"	40 #import "chrome/browser/ui/cocoa/themed_window.h"

41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

42 #import "chrome/browser/ui/cocoa/view_id_util.h"	42 #import "chrome/browser/ui/cocoa/view_id_util.h"

43 #import "chrome/browser/ui/cocoa/view_resizer.h"	43 #import "chrome/browser/ui/cocoa/view_resizer.h"

44 #include "chrome/browser/ui/tabs/tab_strip_model.h"	44 #include "chrome/browser/ui/tabs/tab_strip_model.h"

45 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"	45 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"

46 #include "chrome/common/extensions/extension_constants.h"	46 #include "chrome/common/extensions/extension_constants.h"

47 #include "chrome/common/pref_names.h"	47 #include "chrome/common/pref_names.h"

48 #include "chrome/common/url_constants.h"	48 #include "chrome/common/url_constants.h"

49 #include "components/bookmarks/core/browser/bookmark_model.h"	49 #include "components/bookmarks/browser/bookmark_model.h"

50 #include "components/bookmarks/core/browser/bookmark_node_data.h"	50 #include "components/bookmarks/browser/bookmark_node_data.h"

51 #include "components/bookmarks/core/browser/bookmark_utils.h"	51 #include "components/bookmarks/browser/bookmark_utils.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 "extensions/browser/extension_registry.h"	54 #include "extensions/browser/extension_registry.h"

55 #include "extensions/common/extension.h"	55 #include "extensions/common/extension.h"

56 #include "extensions/common/extension_set.h"	56 #include "extensions/common/extension_set.h"

57 #include "grit/generated_resources.h"	57 #include "grit/generated_resources.h"

58 #include "grit/theme_resources.h"	58 #include "grit/theme_resources.h"

59 #include "grit/ui_resources.h"	59 #include "grit/ui_resources.h"

60 #import "ui/base/cocoa/cocoa_base_utils.h"	60 #import "ui/base/cocoa/cocoa_base_utils.h"

61 #include "ui/base/l10n/l10n_util_mac.h"	61 #include "ui/base/l10n/l10n_util_mac.h"

(...skipping 2618 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2680 - (id<BookmarkButtonControllerProtocol>)controllerForNode:	2680 - (id<BookmarkButtonControllerProtocol>)controllerForNode:

2681 (const BookmarkNode*)node {	2681 (const BookmarkNode*)node {

2682 // See if it's in the bar, then if it is in the hierarchy of visible	2682 // See if it's in the bar, then if it is in the hierarchy of visible

2683 // folder menus.	2683 // folder menus.

2684 if (bookmarkModel_->bookmark_bar_node() == node)	2684 if (bookmarkModel_->bookmark_bar_node() == node)

2685 return self;	2685 return self;

2686 return [folderController_ controllerForNode:node];	2686 return [folderController_ controllerForNode:node];

2687 }	2687 }

2688	2688

2689 @end	2689 @end

OLD	NEW