diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:07 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:07 +0000 |
commit | a136016faff78780a4776c03e252e51d2f7cae37 (patch) | |
tree | ffbc1550c4275cd674f11410e15639f71daa67cf /chrome/browser/views/importer_view.h | |
parent | 9acc48601ea4aff4e5ec977c0dd089e887ba5ffd (diff) | |
download | chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.zip chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.tar.gz chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.tar.bz2 |
Adds link to bookmark bar that when clicked imports bookmarks. I also
added support for baselines to GridLayout.
BUG=4374
TEST=On a new profile make sure the bookmark bar has a link to import
bookmarks, click the link and make sure you can import your bookmarks.
Review URL: http://codereview.chromium.org/440029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/importer_view.h')
-rw-r--r-- | chrome/browser/views/importer_view.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h index 88a07cb..ac1bc20 100644 --- a/chrome/browser/views/importer_view.h +++ b/chrome/browser/views/importer_view.h @@ -30,7 +30,9 @@ class ImporterView : public views::View, public views::Combobox::Listener, public ImportObserver { public: - explicit ImporterView(Profile* profile); + // Creates a new ImporterView. |initial_state| is a bitmask of ImportItems. + // Each checkbox for the bits in |initial_state| is checked. + ImporterView(Profile* profile, int initial_state); virtual ~ImporterView(); // Overridden from views::View. @@ -88,6 +90,9 @@ class ImporterView : public views::View, // selected item in the combo-box. std::vector<uint16> checkbox_items_; + // Initial state of the checkbox_items_. + uint16 initial_state_; + Profile* profile_; DISALLOW_EVIL_CONSTRUCTORS(ImporterView); |