diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 18:03:29 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 18:03:29 +0000 |
| commit | 569b1106f62d531c11f857f08961f41efe2b272e (patch) | |
| tree | c9a4d93a65b16317604e544854f5ee9a15751896 /chrome/browser | |
| parent | 423bd5b84aee7a02b62e4e4d8a83d7df6c0943d9 (diff) | |
| download | chromium_src-569b1106f62d531c11f857f08961f41efe2b272e.zip chromium_src-569b1106f62d531c11f857f08961f41efe2b272e.tar.gz chromium_src-569b1106f62d531c11f857f08961f41efe2b272e.tar.bz2 | |
Porting in chrome/
Review URL: http://codereview.chromium.org/18446
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/base_history_model.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.h | 4 | ||||
| -rw-r--r-- | chrome/browser/browser.scons | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/base_history_model.cc b/chrome/browser/base_history_model.cc index eda43c0..cce4923 100644 --- a/chrome/browser/base_history_model.cc +++ b/chrome/browser/base_history_model.cc @@ -23,9 +23,9 @@ const int BaseHistoryModel::kHistoryScopeMonths = 18; BaseHistoryModel::BaseHistoryModel(Profile* profile) : profile_(profile), observer_(NULL), + is_search_results_(false), thumbnails_(kThumbnailCacheSize), - favicons_(kThumbnailCacheSize), - is_search_results_(false) { + favicons_(kThumbnailCacheSize) { if (!kDefaultFavicon) { kDefaultFavicon = ResourceBundle::GetSharedInstance(). GetBitmapNamed(IDR_DEFAULT_FAVICON); diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index 7a83caa..b41542b 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -42,6 +42,9 @@ void CloneDragData(BookmarkModel* model, BookmarkNode* parent, int index_to_add_at); +#if defined(OS_WIN) +// TODO(port): Make OpenAll portable (remove HWND). + // Recursively opens all bookmarks. |initial_disposition| dictates how the // first URL is opened, all subsequent URLs are opened as background tabs. // |navigator| is used to open the URLs. If |navigator| is NULL the last @@ -59,6 +62,7 @@ void OpenAll(HWND parent, PageNavigator* navigator, BookmarkNode* node, WindowOpenDisposition initial_disposition); +#endif // defined(OS_WIN) // Copies nodes onto the clipboard. If |remove_nodes| is true the nodes are // removed after copied to the clipboard. The nodes are copied in such a way diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 2a94ddd..c200bb3 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -675,21 +675,17 @@ if not env.Bit('windows'): 'autocomplete/autocomplete_edit.cc', 'autocomplete/autocomplete_popup.cc', 'autocomplete/edit_drop_target.cc', - 'autocomplete/history_contents_provider.cc', 'autocomplete/history_url_provider.cc', 'autocomplete/search_provider.cc', 'automation/automation_provider.cc', 'automation/automation_provider_list.cc', 'automation/ui_controls.cc', 'back_forward_menu_model.cc', - 'base_history_model.cc', 'bookmarks/bookmark_context_menu.cc', 'bookmarks/bookmark_drag_data.cc', 'bookmarks/bookmark_drop_info.cc', - 'bookmarks/bookmark_folder_tree_model.cc', 'bookmarks/bookmark_model.cc', 'bookmarks/bookmark_storage.cc', - 'bookmarks/bookmark_table_model.cc', 'bookmarks/bookmark_utils.cc', 'browser.cc', 'browser_about_handler.cc', |