Small porting in chrome/

This is actually http://codereview.chromium.org/18446 without
process_watcher changes.

Review URL: http://codereview.chromium.org/18724

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8622 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 21 insertions, 13 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 0dea200..225d6fa 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -672,21 +672,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',
diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index 7f2fd74..aa65c66 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -218,13 +218,9 @@ if not env.Bit('windows'):
       'gfx/icon_util.cc',
       'gfx/path.cc',
       'ipc_logging.cc',
-      'jstemplate_builder.cc',
       'os_exchange_data.cc',
       'plugin_messages.cc',
       'process_watcher.cc',
-      'security_filter_peer.cc',
-      'win_safe_util.cc',
-      'win_util.cc',
   )
 
 if not env.Bit('windows'):
@@ -235,6 +231,8 @@ if not env.Bit('windows'):
       'gfx/chrome_font_win.cc',
       'ipc_channel_win.cc',
       'resource_bundle_win.cc',
+      'win_safe_util.cc',
+      'win_util.cc',
       '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
   )
 
diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h
index 616680d..ef19b71 100644
--- a/chrome/common/security_filter_peer.h
+++ b/chrome/common/security_filter_peer.h
@@ -50,8 +50,8 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
    SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
                       webkit_glue::ResourceLoaderBridge::Peer* peer);
 
-   webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
    webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
+   webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(SecurityFilterPeer);
diff --git a/chrome/views/table_view.h b/chrome/views/table_view.h
index 88dada3..abe0f45 100644
--- a/chrome/views/table_view.h
+++ b/chrome/views/table_view.h
@@ -5,7 +5,11 @@
 #ifndef CHROME_VIEWS_TABLE_VIEW_H_
 #define CHROME_VIEWS_TABLE_VIEW_H_
 
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
 #include <windows.h>
+#endif  // defined(OS_WIN)
 
 #include <map>
 #include <unicode/coll.h>
@@ -14,7 +18,10 @@
 
 #include "base/logging.h"
 #include "chrome/common/l10n_util.h"
+#if defined(OS_WIN)
+// TODO(port): remove the ifdef when native_control.h is ported.
 #include "chrome/views/native_control.h"
+#endif  // defined(OS_WIN)
 #include "SkColor.h"
 
 class SkBitmap;
@@ -284,6 +291,8 @@ class TableViewObserver {
   virtual void OnTableViewDelete(TableView* table_view) {}
 };
 
+#if defined(OS_WIN)
+// TODO(port): Port TableView.
 class TableView : public NativeControl,
                   public TableModelObserver {
  public:
@@ -661,6 +670,7 @@ class TableView : public NativeControl,
 
   DISALLOW_COPY_AND_ASSIGN(TableView);
 };
+#endif  // defined(OS_WIN)
 
 }  // namespace views
 
diff --git a/chrome/views/tree_node_model.h b/chrome/views/tree_node_model.h
index 695e4ab..18b93f9 100644
--- a/chrome/views/tree_node_model.h
+++ b/chrome/views/tree_node_model.h
@@ -189,8 +189,8 @@ class TreeNodeModel : public TreeModel {
   // Creates a TreeNodeModel with the specified root node. The root is owned
   // by the TreeNodeModel.
   explicit TreeNodeModel(NodeType* root)
-      : observer_(NULL),
-        root_(root) {
+      : root_(root),
+        observer_(NULL) {
   }
 
   virtual ~TreeNodeModel() {}