More style nits.

(Working on cleaning chrome/ so hopefully we can lint it by default.)

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

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

10 files changed, 38 insertions, 31 deletions

diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/dom_ui/chrome_url_data_manager.h
index beecdaa..22b1ee4 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.h
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
-#define BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
+#define CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
 
 #include <map>
 #include <string>
@@ -106,7 +106,7 @@ class ChromeURLDataManager {
 
   static URLRequestJob* Factory(URLRequest* request, const std::string& scheme);
 
-private:
+ private:
   friend class URLRequestChromeJob;
 
   // Parse a URL into the components used to resolve its request.
@@ -154,8 +154,8 @@ private:
 // Since we have a single global ChromeURLDataManager, we don't need to
 // grab a reference to it when creating Tasks involving it.
 template <> struct RunnableMethodTraits<ChromeURLDataManager> {
-  void RetainCallee(ChromeURLDataManager*) {}
-  void ReleaseCallee(ChromeURLDataManager*) {}
+  void RetainCallee(ChromeURLDataManager* manager) {}
+  void ReleaseCallee(ChromeURLDataManager* manager) {}
 };
 
 // The single global instance of ChromeURLDataManager.
@@ -168,4 +168,4 @@ void RegisterURLRequestChromeJob();
 // Undoes the registration done by RegisterURLRequestChromeJob.
 void UnregisterURLRequestChromeJob();
 
-#endif  // BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
+#endif  // CHROME_BROWSER_DOM_UI_CHROME_URL_DATA_MANAGER_H_
diff --git a/chrome/browser/dom_ui/dom_ui_factory.h b/chrome/browser/dom_ui/dom_ui_factory.h
index db1500c..705708a 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.h
+++ b/chrome/browser/dom_ui/dom_ui_factory.h
@@ -47,7 +47,7 @@ class DOMUIFactory {
 
  private:
   // Class is for scoping only.
-  DOMUIFactory() {};
+  DOMUIFactory() {}
 };
 
 #endif  // CHROME_BROWSER_DOM_UI_DOM_UI_FACTORY_H_
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
index 4e1555d..6daf357 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DOM_UI_DOM_UI_THUMBNAIL_SOURCE_H_
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc
index 33ea691..bdaddd7 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.cc
+++ b/chrome/browser/dom_ui/downloads_dom_handler.cc
@@ -223,7 +223,7 @@ void DownloadsDOMHandler::SendCurrentDownloads() {
     int index = static_cast<int>(it - download_items_.begin());
     if (index > kMaxDownloads)
       break;
-    results_value.Append(CreateDownloadItemValue(*it,index));
+    results_value.Append(CreateDownloadItemValue(*it, index));
   }
 
   dom_ui_->CallJavascriptFunction(L"downloadsList", results_value);
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.h b/chrome/browser/dom_ui/downloads_dom_handler.h
index cb5063e..52a54da 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.h
+++ b/chrome/browser/dom_ui/downloads_dom_handler.h
@@ -103,4 +103,4 @@ class DownloadsDOMHandler : public DOMMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(DownloadsDOMHandler);
 };
 
-#endif // CHROME_BROWSER_DOM_UI_DOWNLOADS_DOM_HANDLER_H_
+#endif  // CHROME_BROWSER_DOM_UI_DOWNLOADS_DOM_HANDLER_H_
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h
index 0f2924d..a13c207 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/dom_ui/fileicon_source.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
 #define CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
 
+#include <string>
+
 #include "app/resource_bundle.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/icon_manager.h"
diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h
index 846fa61..892b2ab 100644
--- a/chrome/browser/dom_ui/history_ui.h
+++ b/chrome/browser/dom_ui/history_ui.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_UI_HISTORY_UI_H_
 #define CHROME_BROWSER_DOM_UI_HISTORY_UI_H_
 
+#include <string>
 #include <vector>
 
 #include "chrome/browser/browsing_data_remover.h"
diff --git a/chrome/browser/dom_ui/html_dialog_ui.h b/chrome/browser/dom_ui/html_dialog_ui.h
index fce8f7c..ffc5196 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.h
+++ b/chrome/browser/dom_ui/html_dialog_ui.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_UI_HTML_DIALOG_UI_H_
 #define CHROME_BROWSER_DOM_UI_HTML_DIALOG_UI_H_
 
+#include <string>
 #include <vector>
 
 #include "chrome/browser/dom_ui/dom_ui.h"
@@ -18,33 +19,33 @@ class Size;
 // Implement this class to receive notifications.
 class HtmlDialogUIDelegate {
  public:
-   // Returns true if the contents needs to be run in a modal dialog.
-   virtual bool IsDialogModal() const = 0;
+  // Returns true if the contents needs to be run in a modal dialog.
+  virtual bool IsDialogModal() const = 0;
 
-   // Returns the title of the dialog.
-   virtual std::wstring GetDialogTitle() const = 0;
+  // Returns the title of the dialog.
+  virtual std::wstring GetDialogTitle() const = 0;
 
-   // Get the HTML file path for the content to load in the dialog.
-   virtual GURL GetDialogContentURL() const = 0;
+  // Get the HTML file path for the content to load in the dialog.
+  virtual GURL GetDialogContentURL() const = 0;
 
-   // Get DOMMessageHandler objects to handle messages from the HTML/JS page.
-   // The handlers are used to send and receive messages from the page while it
-   // is still open.  Ownership of each handler is taken over by the DOMUI
-   // hosting the page.
-   virtual void GetDOMMessageHandlers(
-       std::vector<DOMMessageHandler*>* handlers) const = 0;
+  // Get DOMMessageHandler objects to handle messages from the HTML/JS page.
+  // The handlers are used to send and receive messages from the page while it
+  // is still open.  Ownership of each handler is taken over by the DOMUI
+  // hosting the page.
+  virtual void GetDOMMessageHandlers(
+      std::vector<DOMMessageHandler*>* handlers) const = 0;
 
-   // Get the size of the dialog.
-   virtual void GetDialogSize(gfx::Size* size) const = 0;
+  // Get the size of the dialog.
+  virtual void GetDialogSize(gfx::Size* size) const = 0;
 
-   // Gets the JSON string input to use when showing the dialog.
-   virtual std::string GetDialogArgs() const = 0;
+  // Gets the JSON string input to use when showing the dialog.
+  virtual std::string GetDialogArgs() const = 0;
 
-   // A callback to notify the delegate that the dialog closed.
-   virtual void OnDialogClosed(const std::string& json_retval) = 0;
+  // A callback to notify the delegate that the dialog closed.
+  virtual void OnDialogClosed(const std::string& json_retval) = 0;
 
-  protected:
-   ~HtmlDialogUIDelegate() {}
+ protected:
+  ~HtmlDialogUIDelegate() {}
 };
 
 // Displays file URL contents inside a modal HTML dialog.
@@ -71,7 +72,7 @@ class HtmlDialogUI : public DOMUI {
   };
 
   // When created, the property should already be set on the TabContents.
-  HtmlDialogUI(TabContents* tab_contents);
+  explicit HtmlDialogUI(TabContents* tab_contents);
   virtual ~HtmlDialogUI();
 
   // Returns the PropertyBag accessor object used to write the delegate pointer
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index 24f0ace..5aed7c5 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_
 #define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_
 
+#include <string>
+
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/dom_ui/shown_sections_handler.h b/chrome/browser/dom_ui/shown_sections_handler.h
index 70a7a50..cc1a300 100644
--- a/chrome/browser/dom_ui/shown_sections_handler.h
+++ b/chrome/browser/dom_ui/shown_sections_handler.h
@@ -22,7 +22,7 @@ enum Section {
 class ShownSectionsHandler : public DOMMessageHandler {
  public:
   ShownSectionsHandler() {}
-  virtual ~ShownSectionsHandler() {}  
+  virtual ~ShownSectionsHandler() {}
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();