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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "components/bookmarks/browser/bookmark_model.h" 51 #include "components/bookmarks/browser/bookmark_model.h"
52 #include "components/bookmarks/browser/bookmark_node_data.h" 52 #include "components/bookmarks/browser/bookmark_node_data.h"
53 #include "components/bookmarks/browser/bookmark_utils.h" 53 #include "components/bookmarks/browser/bookmark_utils.h"
54 #include "content/public/browser/user_metrics.h" 54 #include "content/public/browser/user_metrics.h"
55 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
56 #include "extensions/browser/extension_registry.h" 56 #include "extensions/browser/extension_registry.h"
57 #include "extensions/common/extension.h" 57 #include "extensions/common/extension.h"
58 #include "extensions/common/extension_set.h" 58 #include "extensions/common/extension_set.h"
59 #include "grit/generated_resources.h" 59 #include "grit/generated_resources.h"
60 #include "grit/theme_resources.h" 60 #include "grit/theme_resources.h"
61 #include "grit/ui_resources.h"
62 #import "ui/base/cocoa/cocoa_base_utils.h" 61 #import "ui/base/cocoa/cocoa_base_utils.h"
63 #include "ui/base/l10n/l10n_util_mac.h" 62 #include "ui/base/l10n/l10n_util_mac.h"
64 #include "ui/base/resource/resource_bundle.h" 63 #include "ui/base/resource/resource_bundle.h"
65 #include "ui/gfx/image/image.h" 64 #include "ui/gfx/image/image.h"
65 #include "ui/resources/grit/ui_resources.h"
66 66
67 using base::UserMetricsAction; 67 using base::UserMetricsAction;
68 using bookmarks::BookmarkNodeData; 68 using bookmarks::BookmarkNodeData;
69 using content::OpenURLParams; 69 using content::OpenURLParams;
70 using content::Referrer; 70 using content::Referrer;
71 using content::WebContents; 71 using content::WebContents;
72 72
73 // Bookmark bar state changing and animations 73 // Bookmark bar state changing and animations
74 // 74 //
75 // The bookmark bar has three real states: "showing" (a normal bar attached to 75 // The bookmark bar has three real states: "showing" (a normal bar attached to
(...skipping 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after
2797 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 2797 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
2798 (const BookmarkNode*)node { 2798 (const BookmarkNode*)node {
2799 // See if it's in the bar, then if it is in the hierarchy of visible 2799 // See if it's in the bar, then if it is in the hierarchy of visible
2800 // folder menus. 2800 // folder menus.
2801 if (bookmarkModel_->bookmark_bar_node() == node) 2801 if (bookmarkModel_->bookmark_bar_node() == node)
2802 return self; 2802 return self;
2803 return [folderController_ controllerForNode:node]; 2803 return [folderController_ controllerForNode:node];
2804 } 2804 }
2805 2805
2806 @end 2806 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698