Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_tab_util_android.cc

diff --git a/src/chrome/browser/extensions/extension_tab_util_android.cc b/src/chrome/browser/extensions/extension_tab_util_android.cc
index 671f862..9d0abe8 100644 (file)
--- a/src/chrome/browser/extensions/extension_tab_util_android.cc
+++ b/src/chrome/browser/extensions/extension_tab_util_android.cc
@@ -8,54 +8,61 @@
 #include "chrome/browser/sessions/session_id.h"
 #include "url/gurl.h"
 
-using base::DictionaryValue;
-using base::ListValue;
 using content::WebContents;
 
+namespace extensions {
+
+// static
 int ExtensionTabUtil::GetWindowId(const Browser* browser) {
   NOTIMPLEMENTED();
   return -1;
 }
 
+// static
 int ExtensionTabUtil::GetWindowIdOfTabStripModel(
     const TabStripModel* tab_strip_model) {
   NOTIMPLEMENTED();
   return -1;
 }
 
-int ExtensionTabUtil::GetTabId(const WebContents* web_contents) {
+// static
+int ExtensionTabUtil::GetTabId(WebContents* web_contents) {
   return SessionID::IdForTab(web_contents);
 }
 
+// static
 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
   NOTIMPLEMENTED();
   return -1;
 }
 
-DictionaryValue* ExtensionTabUtil::CreateTabValue(
-    const WebContents* contents,
+// static
+base::DictionaryValue* ExtensionTabUtil::CreateTabValue(
+    WebContents* contents,
     TabStripModel* tab_strip,
     int tab_index,
-    const extensions::Extension* extension) {
+    const Extension* extension) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-ListValue* ExtensionTabUtil::CreateTabList(
-    const Browser* browser,
-    const extensions::Extension* extension) {
+// static
+base::ListValue* ExtensionTabUtil::CreateTabList(const Browser* browser,
+                                                 const Extension* extension) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-DictionaryValue* ExtensionTabUtil::CreateTabValue(
-    const WebContents* contents,
+// static
+base::DictionaryValue* ExtensionTabUtil::CreateTabValue(
+    WebContents* contents,
     TabStripModel* tab_strip,
     int tab_index) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
+// static
 bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents,
                                         TabStripModel** tab_strip_model,
                                         int* tab_index) {
@@ -63,6 +70,7 @@ bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents,
   return false;
 }
 
+// static
 bool ExtensionTabUtil::GetDefaultTab(Browser* browser,
                                      content::WebContents** contents,
                                      int* tab_id) {
@@ -70,6 +78,7 @@ bool ExtensionTabUtil::GetDefaultTab(Browser* browser,
   return false;
 }
 
+// static
 bool ExtensionTabUtil::GetTabById(int tab_id,
                                   Profile* profile,
                                   bool include_incognito,
@@ -81,17 +90,20 @@ bool ExtensionTabUtil::GetTabById(int tab_id,
   return false;
 }
 
+// static
 GURL ExtensionTabUtil::ResolvePossiblyRelativeURL(const std::string& url_string,
-    const extensions::Extension* extension) {
+                                                  const Extension* extension) {
   NOTIMPLEMENTED();
   return GURL();
 }
 
+// static
 bool ExtensionTabUtil::IsCrashURL(const GURL& url) {
   NOTIMPLEMENTED();
   return false;
 }
 
+// static
 void ExtensionTabUtil::CreateTab(WebContents* web_contents,
                                  const std::string& extension_id,
                                  WindowOpenDisposition disposition,
@@ -107,8 +119,10 @@ void ExtensionTabUtil::ForEachTab(
 }
 
 // static
-extensions::WindowController* ExtensionTabUtil::GetWindowControllerOfTab(
+WindowController* ExtensionTabUtil::GetWindowControllerOfTab(
     const WebContents* web_contents) {
   NOTIMPLEMENTED();
   return NULL;
 }
+
+}  // namespace extensions