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

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

Issue 10642014: grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac search hint Created 8 years, 6 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/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 30 matching lines...) Expand all
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/webui/ntp/app_launcher_handler.h" 44 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
45 #include "chrome/common/extensions/extension_constants.h" 45 #include "chrome/common/extensions/extension_constants.h"
46 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
47 #include "content/public/browser/user_metrics.h" 47 #include "content/public/browser/user_metrics.h"
48 #include "content/public/browser/web_contents.h" 48 #include "content/public/browser/web_contents.h"
49 #include "content/public/browser/web_contents_view.h" 49 #include "content/public/browser/web_contents_view.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/theme_resources.h" 51 #include "grit/theme_resources_standard.h"
52 #include "grit/ui_resources.h" 52 #include "grit/ui_resources.h"
53 #include "skia/ext/skia_utils_mac.h" 53 #include "skia/ext/skia_utils_mac.h"
54 #include "ui/base/l10n/l10n_util_mac.h" 54 #include "ui/base/l10n/l10n_util_mac.h"
55 #include "ui/base/resource/resource_bundle.h" 55 #include "ui/base/resource/resource_bundle.h"
56 #include "ui/gfx/image/image.h" 56 #include "ui/gfx/image/image.h"
57 #include "ui/gfx/mac/nsimage_cache.h" 57 #include "ui/gfx/mac/nsimage_cache.h"
58 58
59 using content::OpenURLParams; 59 using content::OpenURLParams;
60 using content::Referrer; 60 using content::Referrer;
61 using content::UserMetricsAction; 61 using content::UserMetricsAction;
(...skipping 2726 matching lines...) Expand 10 before | Expand all | Expand 10 after
2788 // to minimize touching the object passed in (likely a mock). 2788 // to minimize touching the object passed in (likely a mock).
2789 - (void)setButtonContextMenu:(id)menu { 2789 - (void)setButtonContextMenu:(id)menu {
2790 buttonContextMenu_ = menu; 2790 buttonContextMenu_ = menu;
2791 } 2791 }
2792 2792
2793 - (void)setIgnoreAnimations:(BOOL)ignore { 2793 - (void)setIgnoreAnimations:(BOOL)ignore {
2794 ignoreAnimations_ = ignore; 2794 ignoreAnimations_ = ignore;
2795 } 2795 }
2796 2796
2797 @end 2797 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698