diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-26 21:45:34 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-26 21:45:34 +0000 |
commit | 96788b0612875c0d12584757b63f02112e9541a7 (patch) | |
tree | d7eb82156c83b850d2714110dd7d8bb7aad60c41 /chrome/browser/cocoa/l10n_util.h | |
parent | 21ca7bf8f06e3b6e608f26eed8dce30515721b86 (diff) | |
download | chromium_src-96788b0612875c0d12584757b63f02112e9541a7.zip chromium_src-96788b0612875c0d12584757b63f02112e9541a7.tar.gz chromium_src-96788b0612875c0d12584757b63f02112e9541a7.tar.bz2 |
Mac: First run bubble.
Add a BaseBubbleController. Move ContentBlockedBubbleController to use it (other bubbles will follow in later CLs), add FIrstRunBubbleController which uses it.
Move some l10n stuff to l10n_util and use that, too.
Update first run code to actually call the bubble code. Fix a double free while I'm at it (the scoped_ptr<> in DoFirstRun() already does the freeing, no need to do it in FirstRunDone())
BUG=27489,36366
TEST=Firstrun bubble shows up when starting chrome with --first-run, doesn't if starting chrome without that flag. Content blocked bubbles still work.
Review URL: http://codereview.chromium.org/2822026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/l10n_util.h')
-rw-r--r-- | chrome/browser/cocoa/l10n_util.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/l10n_util.h b/chrome/browser/cocoa/l10n_util.h index 5e417a1..bb26327 100644 --- a/chrome/browser/cocoa/l10n_util.h +++ b/chrome/browser/cocoa/l10n_util.h @@ -4,6 +4,8 @@ #import <Cocoa/Cocoa.h> +#include "base/string16.h" + namespace cocoa_l10n_util { // Compare function for -[NSArray sortedArrayUsingFunction:context:] that @@ -16,4 +18,15 @@ NSInteger CompareFrameY(id view1, id view2, void* context); // anything else: do +[GTMUILocalizerAndLayoutTweaker sizeToFitView:] NSSize WrapOrSizeToFit(NSView* view); +// Walks views in top-down order, wraps each to their current width, and moves +// the latter ones down to prevent overlaps. Returns the vertical delta in view +// coordinates. +CGFloat VerticallyReflowGroup(NSArray* views); + +// Like |ReplaceStringPlaceholders(const string16&, const string16&, size_t*)|, +// but for a NSString formatString. +NSString* ReplaceNSStringPlaceholders(NSString* formatString, + const string16& a, + size_t* offset); + } // namespace cocoa_l10n_util |