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

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

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some comments Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_editor.h" 10 #include "chrome/browser/bookmarks/bookmark_editor.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/common/extensions/extension_constants.h" 44 #include "chrome/common/extensions/extension_constants.h"
45 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
46 #include "grit/app_resources.h" 46 #include "grit/app_resources.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 #include "grit/theme_resources.h" 48 #include "grit/theme_resources.h"
49 #include "skia/ext/skia_utils_mac.h" 49 #include "skia/ext/skia_utils_mac.h"
50 #include "ui/base/l10n/l10n_util_mac.h" 50 #include "ui/base/l10n/l10n_util_mac.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/gfx/image.h"
52 53
53 // Bookmark bar state changing and animations 54 // Bookmark bar state changing and animations
54 // 55 //
55 // The bookmark bar has three real states: "showing" (a normal bar attached to 56 // The bookmark bar has three real states: "showing" (a normal bar attached to
56 // the toolbar), "hidden", and "detached" (pretending to be part of the web 57 // the toolbar), "hidden", and "detached" (pretending to be part of the web
57 // content on the NTP). It can, or at least should be able to, animate between 58 // content on the NTP). It can, or at least should be able to, animate between
58 // these states. There are several complications even without animation: 59 // these states. There are several complications even without animation:
59 // - The placement of the bookmark bar is done by the BWC, and it needs to know 60 // - The placement of the bookmark bar is done by the BWC, and it needs to know
60 // the state in order to place the bookmark bar correctly (immediately below 61 // the state in order to place the bookmark bar correctly (immediately below
61 // the toolbar when showing, below the infobar when detached). 62 // the toolbar when showing, below the infobar when detached).
(...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after
2503 // to minimize touching the object passed in (likely a mock). 2504 // to minimize touching the object passed in (likely a mock).
2504 - (void)setButtonContextMenu:(id)menu { 2505 - (void)setButtonContextMenu:(id)menu {
2505 buttonContextMenu_ = menu; 2506 buttonContextMenu_ = menu;
2506 } 2507 }
2507 2508
2508 - (void)setIgnoreAnimations:(BOOL)ignore { 2509 - (void)setIgnoreAnimations:(BOOL)ignore {
2509 ignoreAnimations_ = ignore; 2510 ignoreAnimations_ = ignore;
2510 } 2511 }
2511 2512
2512 @end 2513 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/about_window_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698