diff options
Diffstat (limited to 'chrome/browser/ui/webui')
58 files changed, 378 insertions, 292 deletions
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h index bed84d7..9bf894b 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager.h @@ -13,12 +13,15 @@ #include "content/browser/browser_thread.h" class ChromeURLDataManagerBackend; -class DictionaryValue; class FilePath; class MessageLoop; class Profile; class RefCountedMemory; +namespace base { +class DictionaryValue; +} + // To serve dynamic data off of chrome: URLs, implement the // ChromeURLDataManager::DataSource interface and register your handler // with AddDataSource. DataSources must be added on the UI thread (they are also @@ -102,7 +105,8 @@ class ChromeURLDataManager { // TODO: nuke this and convert all callers to not replace. virtual bool ShouldReplaceExistingSource() const; - static void SetFontAndTextDirection(DictionaryValue* localized_strings); + static void SetFontAndTextDirection( + base::DictionaryValue* localized_strings); protected: virtual ~DataSource(); diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h index 2d947de..3dd3c20 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h @@ -12,7 +12,10 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "content/browser/webui/web_ui.h" +namespace base { +class DictionaryValue; class ListValue; +} namespace chromeos { @@ -35,7 +38,7 @@ class EulaScreenHandler : public EulaScreenActor, virtual void OnPasswordFetched(const std::string& tpm_password); // OobeMessageHandler implementation: - virtual void GetLocalizedStrings(DictionaryValue* localized_strings); + virtual void GetLocalizedStrings(base::DictionaryValue* localized_strings); virtual void Initialize(); // WebUIMessageHandler implementation: @@ -43,9 +46,9 @@ class EulaScreenHandler : public EulaScreenActor, private: // JS messages handlers. - void HandleOnExit(const ListValue* args); - void HandleOnLearnMore(const ListValue* args); - void HandleOnTpmPopupOpened(const ListValue* args); + void HandleOnExit(const base::ListValue* args); + void HandleOnLearnMore(const base::ListValue* args); + void HandleOnTpmPopupOpened(const base::ListValue* args); Delegate* delegate_; diff --git a/chrome/browser/ui/webui/chromeos/login/login_ui.h b/chrome/browser/ui/webui/chromeos/login/login_ui.h index 877b0810..0c18e5e 100644 --- a/chrome/browser/ui/webui/chromeos/login/login_ui.h +++ b/chrome/browser/ui/webui/chromeos/login/login_ui.h @@ -92,9 +92,9 @@ class LoginUIHandler : public WebUIMessageHandler, HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE; // Callbacks from javascript. - void HandleAuthenticateUser(const ListValue* args); - void HandleLaunchIncognito(const ListValue* args); - void HandleShutdownSystem(const ListValue* args); + void HandleAuthenticateUser(const base::ListValue* args); + void HandleLaunchIncognito(const base::ListValue* args); + void HandleShutdownSystem(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(LoginUIHandler); }; diff --git a/chrome/browser/ui/webui/chromeos/login/login_ui_helpers.h b/chrome/browser/ui/webui/chromeos/login/login_ui_helpers.h index 8986fc2..f438e09 100644 --- a/chrome/browser/ui/webui/chromeos/login/login_ui_helpers.h +++ b/chrome/browser/ui/webui/chromeos/login/login_ui_helpers.h @@ -10,10 +10,13 @@ #include "base/string_piece.h" -class DictionaryValue; class FilePath; class RefCountedBytes; +namespace base { +class DictionaryValue; +} + namespace chromeos { // This class is used for encapsulating the statics and other other messy @@ -28,7 +31,7 @@ class HTMLOperationsInterface { virtual base::StringPiece GetLoginHTML(); virtual std::string GetFullHTML(base::StringPiece login_html, - DictionaryValue* localized_strings); + base::DictionaryValue* localized_strings); virtual RefCountedBytes* CreateHTMLBytes(std::string full_html); private: diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h index 96f06f1..511bc92 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h @@ -11,7 +11,9 @@ #include "content/browser/webui/web_ui.h" #include "ui/gfx/point.h" +namespace base { class ListValue; +} namespace views { class Widget; @@ -39,7 +41,7 @@ class NetworkScreenHandler : public NetworkScreenActor, virtual void EnableContinue(bool enabled); // OobeMessageHandler implementation: - virtual void GetLocalizedStrings(DictionaryValue* localized_strings); + virtual void GetLocalizedStrings(base::DictionaryValue* localized_strings); virtual void Initialize(); // WebUIMessageHandler implementation: @@ -47,24 +49,24 @@ class NetworkScreenHandler : public NetworkScreenActor, private: // Handles change of the network control position. - void HandleNetworkControlPosition(const ListValue* args); + void HandleNetworkControlPosition(const base::ListValue* args); // Handles moving off the screen. - void HandleOnExit(const ListValue* args); + void HandleOnExit(const base::ListValue* args); // Handles change of the language. - void HandleOnLanguageChanged(const ListValue* args); + void HandleOnLanguageChanged(const base::ListValue* args); // Handles change of the input method. - void HandleOnInputMethodChanged(const ListValue* args); + void HandleOnInputMethodChanged(const base::ListValue* args); // Returns available languages. Caller gets the ownership. Note, it does // depend on the current locale. - static ListValue* GetLanguageList(); + static base::ListValue* GetLanguageList(); // Returns available input methods. Caller gets the ownership. Note, it does // depend on the current locale. - static ListValue* GetInputMethods(); + static base::ListValue* GetInputMethods(); // Creates network window or updates it's bounds. void CreateOrUpdateNetworkWindow(); diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h index 0af6ba7..feb60ba 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h @@ -9,7 +9,9 @@ #include "chrome/browser/chromeos/login/oobe_display.h" #include "chrome/browser/ui/webui/chrome_web_ui.h" +namespace base { class DictionaryValue; +} namespace chromeos { class SigninScreenHandler; @@ -24,7 +26,8 @@ class OobeMessageHandler : public WebUIMessageHandler { virtual ~OobeMessageHandler(); // Gets localized strings to be used on the page. - virtual void GetLocalizedStrings(DictionaryValue* localized_strings) = 0; + virtual void GetLocalizedStrings( + base::DictionaryValue* localized_strings) = 0; // This method is called when page is ready. It propagates to inherited class // via virtual Initialize() method (see below). @@ -65,7 +68,7 @@ class OobeUI : public OobeDisplay, virtual ViewScreenDelegate* GetHTMLPageScreenActor(); // Collects localized strings from the owned handlers. - void GetLocalizedStrings(DictionaryValue* localized_strings); + void GetLocalizedStrings(base::DictionaryValue* localized_strings); // Initializes the handlers. void InitializeHandlers(); diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 3eb5e3d..819396d 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -10,7 +10,10 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "content/browser/webui/web_ui.h" +namespace base { +class DictionaryValue; class ListValue; +} namespace chromeos { @@ -25,7 +28,8 @@ class SigninScreenHandler : public OobeMessageHandler, private: // OobeMessageHandler implementation: - virtual void GetLocalizedStrings(DictionaryValue* localized_strings) OVERRIDE; + virtual void GetLocalizedStrings( + base::DictionaryValue* localized_strings) OVERRIDE; virtual void Initialize() OVERRIDE; // WebUIMessageHandler implementation: @@ -38,7 +42,7 @@ class SigninScreenHandler : public OobeMessageHandler, HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE; // Handles authenticate user request from javascript. - void HandleAuthenticateUser(const ListValue* args); + void HandleAuthenticateUser(const base::ListValue* args); // A delegate that glues this handler with backend LoginDisplay. LoginUIHandlerDelegate* delegate_; diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h index 9d21d5d..4afec0d 100644 --- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h @@ -17,7 +17,7 @@ class UpdateScreenHandler : public UpdateScreenActor, virtual ~UpdateScreenHandler(); // OobeMessageHandler implementation: - virtual void GetLocalizedStrings(DictionaryValue* localized_strings); + virtual void GetLocalizedStrings(base::DictionaryValue* localized_strings); virtual void Initialize(); // UpdateScreenActor implementation: diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.h b/chrome/browser/ui/webui/collected_cookies_ui_delegate.h index 493a2db..12d5228 100644 --- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.h +++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.h @@ -66,12 +66,12 @@ class CollectedCookiesUIDelegate : public HtmlDialogUIDelegate, const NotificationDetails& details); // JS callback to bind cookies tree models with JS trees. - void BindCookiesTreeModel(const ListValue* args); + void BindCookiesTreeModel(const base::ListValue* args); // JS callback to block/allow cookies from given site. - void Block(const ListValue* args); - void Allow(const ListValue* args); - void AllowThisSession(const ListValue* args); + void Block(const base::ListValue* args); + void Allow(const base::ListValue* args); + void AllowThisSession(const base::ListValue* args); NotificationRegistrar registrar_; TabContents* tab_contents_; diff --git a/chrome/browser/ui/webui/constrained_html_ui.h b/chrome/browser/ui/webui/constrained_html_ui.h index 54e62d6..58c2058 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.h +++ b/chrome/browser/ui/webui/constrained_html_ui.h @@ -57,7 +57,7 @@ class ConstrainedHtmlUI : public ChromeWebUI { ConstrainedHtmlUIDelegate* GetConstrainedDelegate(); // JS Message Handler - void OnDialogClose(const ListValue* args); + void OnDialogClose(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(ConstrainedHtmlUI); }; diff --git a/chrome/browser/ui/webui/cookies_tree_model_adapter.h b/chrome/browser/ui/webui/cookies_tree_model_adapter.h index 2a5e4e0..971981c 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_adapter.h +++ b/chrome/browser/ui/webui/cookies_tree_model_adapter.h @@ -9,9 +9,12 @@ #include "base/compiler_specific.h" #include "chrome/browser/cookies_tree_model.h" +class WebUI; + +namespace base { class ListValue; class Value; -class WebUI; +} // CookiesTreeModelAdapter binds a CookiesTreeModel with a JS tree. It observes // tree model changes and forwards them to JS tree. It also provides a @@ -45,7 +48,7 @@ class CookiesTreeModelAdapter : public CookiesTreeModel::Observer { // JS callback that gets the tree node using the tree path info in |args| and // call SendChildren to pass back children nodes data to WebUI. - void RequestChildren(const ListValue* args); + void RequestChildren(const base::ListValue* args); // Get children nodes data and pass it to 'CookiesTree.loadChildren' to // update the WebUI. @@ -53,7 +56,7 @@ class CookiesTreeModelAdapter : public CookiesTreeModel::Observer { // Helper function to get a Value* representing id of |node|. // Caller needs to free the returned Value. - Value* GetTreeNodeId(CookieTreeNode* node); + base::Value* GetTreeNodeId(CookieTreeNode* node); // Hosting WebUI of the js tree. WebUI* web_ui_; diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.h b/chrome/browser/ui/webui/cookies_tree_model_util.h index 6e4c1b3..2b27b65 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.h +++ b/chrome/browser/ui/webui/cookies_tree_model_util.h @@ -9,8 +9,11 @@ #include <string> class CookieTreeNode; + +namespace base { class DictionaryValue; class ListValue; +} namespace cookies_tree_model_util { @@ -19,11 +22,11 @@ std::string GetTreeNodeId(CookieTreeNode* node); // Populate given |dict| with cookie tree node properties. void GetCookieTreeNodeDictionary(const CookieTreeNode& node, - DictionaryValue* dict); + base::DictionaryValue* dict); // Append the children nodes of |parent| in specified range to |nodes| list. void GetChildNodeList(CookieTreeNode* parent, int start, int count, - ListValue* nodes); + base::ListValue* nodes); // Gets tree node from |path| under |root|. Return NULL if |path| is not valid. CookieTreeNode* GetTreeNodeFromPath(CookieTreeNode* root, diff --git a/chrome/browser/ui/webui/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads_dom_handler.h index 7da060e..c50ae3d 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads_dom_handler.h @@ -13,7 +13,9 @@ #include "chrome/browser/download/download_manager.h" #include "content/browser/webui/web_ui.h" +namespace base { class ListValue; +} // The handler for Javascript messages related to the "downloads" view, // also observes changes to the download manager. @@ -37,37 +39,37 @@ class DownloadsDOMHandler : public WebUIMessageHandler, virtual void ModelChanged(); // Callback for the "getDownloads" message. - void HandleGetDownloads(const ListValue* args); + void HandleGetDownloads(const base::ListValue* args); // Callback for the "openFile" message - opens the file in the shell. - void HandleOpenFile(const ListValue* args); + void HandleOpenFile(const base::ListValue* args); // Callback for the "drag" message - initiates a file object drag. - void HandleDrag(const ListValue* args); + void HandleDrag(const base::ListValue* args); // Callback for the "saveDangerous" message - specifies that the user // wishes to save a dangerous file. - void HandleSaveDangerous(const ListValue* args); + void HandleSaveDangerous(const base::ListValue* args); // Callback for the "discardDangerous" message - specifies that the user // wishes to discard (remove) a dangerous file. - void HandleDiscardDangerous(const ListValue* args); + void HandleDiscardDangerous(const base::ListValue* args); // Callback for the "show" message - shows the file in explorer. - void HandleShow(const ListValue* args); + void HandleShow(const base::ListValue* args); // Callback for the "pause" message - pauses the file download. - void HandlePause(const ListValue* args); + void HandlePause(const base::ListValue* args); // Callback for the "remove" message - removes the file download from shelf // and list. - void HandleRemove(const ListValue* args); + void HandleRemove(const base::ListValue* args); // Callback for the "cancel" message - cancels the download. - void HandleCancel(const ListValue* args); + void HandleCancel(const base::ListValue* args); // Callback for the "clearAll" message - clears all the downloads. - void HandleClearAll(const ListValue* args); + void HandleClearAll(const base::ListValue* args); private: // Send the current list of downloads to the page. @@ -80,7 +82,7 @@ class DownloadsDOMHandler : public WebUIMessageHandler, DownloadItem* GetDownloadById(int id); // Return the download that is referred to in a given value. - DownloadItem* GetDownloadByValue(const ListValue* args); + DownloadItem* GetDownloadByValue(const base::ListValue* args); // Current search text. std::wstring search_text_; diff --git a/chrome/browser/ui/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h index 4ad6e90..cdc8c26 100644 --- a/chrome/browser/ui/webui/history2_ui.h +++ b/chrome/browser/ui/webui/history2_ui.h @@ -50,16 +50,16 @@ class BrowsingHistoryHandler2 : public WebUIMessageHandler, virtual void RegisterMessages(); // Callback for the "getHistory" message. - void HandleGetHistory(const ListValue* args); + void HandleGetHistory(const base::ListValue* args); // Callback for the "searchHistory" message. - void HandleSearchHistory(const ListValue* args); + void HandleSearchHistory(const base::ListValue* args); // Callback for the "removeURLsOnOneDay" message. - void HandleRemoveURLsOnOneDay(const ListValue* args); + void HandleRemoveURLsOnOneDay(const base::ListValue* args); // Handle for "clearBrowsingData" message. - void HandleClearBrowsingData(const ListValue* args); + void HandleClearBrowsingData(const base::ListValue* args); // NotificationObserver implementation. virtual void Observe(int type, @@ -75,7 +75,7 @@ class BrowsingHistoryHandler2 : public WebUIMessageHandler, void RemoveComplete(); // Extract the arguments from the call to HandleSearchHistory. - void ExtractSearchHistoryArguments(const ListValue* args, + void ExtractSearchHistoryArguments(const base::ListValue* args, int* month, string16* query); diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 78a85b7..4f8197f 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -29,16 +29,16 @@ class BrowsingHistoryHandler : public WebUIMessageHandler, virtual void RegisterMessages(); // Callback for the "getHistory" message. - void HandleGetHistory(const ListValue* args); + void HandleGetHistory(const base::ListValue* args); // Callback for the "searchHistory" message. - void HandleSearchHistory(const ListValue* args); + void HandleSearchHistory(const base::ListValue* args); // Callback for the "removeURLsOnOneDay" message. - void HandleRemoveURLsOnOneDay(const ListValue* args); + void HandleRemoveURLsOnOneDay(const base::ListValue* args); // Handle for "clearBrowsingData" message. - void HandleClearBrowsingData(const ListValue* args); + void HandleClearBrowsingData(const base::ListValue* args); // NotificationObserver implementation. virtual void Observe(int type, @@ -54,7 +54,7 @@ class BrowsingHistoryHandler : public WebUIMessageHandler, void RemoveComplete(); // Extract the arguments from the call to HandleSearchHistory. - void ExtractSearchHistoryArguments(const ListValue* args, + void ExtractSearchHistoryArguments(const base::ListValue* args, int* month, string16* query); diff --git a/chrome/browser/ui/webui/html_dialog_ui.h b/chrome/browser/ui/webui/html_dialog_ui.h index c4a78f6..eb34963 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.h +++ b/chrome/browser/ui/webui/html_dialog_ui.h @@ -19,6 +19,10 @@ class Size; struct ContextMenuParams; +namespace base { +class ListValue; +} + // Implement this class to receive notifications. class HtmlDialogUIDelegate { public: @@ -106,7 +110,7 @@ class HtmlDialogUI : public ChromeWebUI { virtual void RenderViewCreated(RenderViewHost* render_view_host); // JS message handler. - void OnDialogClosed(const ListValue* args); + void OnDialogClosed(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(HtmlDialogUI); }; diff --git a/chrome/browser/ui/webui/media_internals/media_internals_handler.cc b/chrome/browser/ui/webui/media_internals/media_internals_handler.cc index 45bf9c3..8411c08 100644 --- a/chrome/browser/ui/webui/media_internals/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media_internals/media_internals_handler.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/media_internals/media_internals_handler.h" +#include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/media_internals/media_internals_proxy.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/media_internals/media_internals_handler.h b/chrome/browser/ui/webui/media_internals/media_internals_handler.h index dc9fe7c..ed5fd3f 100644 --- a/chrome/browser/ui/webui/media_internals/media_internals_handler.h +++ b/chrome/browser/ui/webui/media_internals/media_internals_handler.h @@ -10,6 +10,10 @@ class MediaInternalsProxy; +namespace base { +class ListValue; +} + // This class handles messages to and from MediaInternalsUI. // It does all its work on the IO thread through the proxy below. class MediaInternalsMessageHandler : public WebUIMessageHandler { @@ -22,7 +26,7 @@ class MediaInternalsMessageHandler : public WebUIMessageHandler { virtual void RegisterMessages(); // Javascript message handlers. - void OnGetEverything(const ListValue* list); + void OnGetEverything(const base::ListValue* list); // MediaInternals message handlers. void OnUpdate(const string16& update); diff --git a/chrome/browser/ui/webui/net_internals_ui.h b/chrome/browser/ui/webui/net_internals_ui.h index 6a70c4e..f75160c 100644 --- a/chrome/browser/ui/webui/net_internals_ui.h +++ b/chrome/browser/ui/webui/net_internals_ui.h @@ -8,7 +8,9 @@ #include "chrome/browser/ui/webui/chrome_web_ui.h" +namespace base { class Value; +} class NetInternalsUI : public ChromeWebUI { public: @@ -16,7 +18,7 @@ class NetInternalsUI : public ChromeWebUI { // Returns a Value containing constants NetInternals needs to load a log file. // Safe to call on any thread. Caller takes ownership of the returned Value. - static Value* GetConstants(); + static base::Value* GetConstants(); private: DISALLOW_COPY_AND_ASSIGN(NetInternalsUI); diff --git a/chrome/browser/ui/webui/new_profile_handler.h b/chrome/browser/ui/webui/new_profile_handler.h index 1a69950..f4518c0 100644 --- a/chrome/browser/ui/webui/new_profile_handler.h +++ b/chrome/browser/ui/webui/new_profile_handler.h @@ -10,6 +10,10 @@ class RefCountedMemory; +namespace base { +class ListValue; +} + // The handler for Javascript messages related to the "new profile" page. class NewProfileHandler : public WebUIMessageHandler { public: @@ -19,13 +23,13 @@ class NewProfileHandler : public WebUIMessageHandler { virtual void RegisterMessages(); // Callback for the "create" message - finishes creating a profile. - void HandleCreate(const ListValue* args); + void HandleCreate(const base::ListValue* args); // Callback for the "cancel" message - cancels creating a profile. - void HandleCancel(const ListValue* args); + void HandleCancel(const base::ListValue* args); // Callback for the "requestProfileInfo" message - sends profile info. - void HandleRequestProfileInfo(const ListValue* args); + void HandleRequestProfileInfo(const base::ListValue* args); private: // Send the default avatar images to the page. diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 5299609..0d1c8c6 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -41,7 +41,7 @@ class AppLauncherHandler : public WebUIMessageHandler, static void CreateAppInfo(const Extension* extension, const AppNotification* notification, ExtensionService* service, - DictionaryValue* value); + base::DictionaryValue* value); // Callback for pings related to launching apps on the NTP. static bool HandlePing(Profile* profile, const std::string& path); @@ -56,45 +56,45 @@ class AppLauncherHandler : public WebUIMessageHandler, const NotificationDetails& details); // Populate the given dictionary with all installed app info. - void FillAppDictionary(DictionaryValue* value); + void FillAppDictionary(base::DictionaryValue* value); // Create a dictionary value for the given extension. May return NULL, e.g. if // the given extension is not an app. If non-NULL, the caller assumes // ownership of the pointer. - DictionaryValue* GetAppInfo(const Extension* extension); + base::DictionaryValue* GetAppInfo(const Extension* extension); // Populate the given dictionary with the web store promo content. - void FillPromoDictionary(DictionaryValue* value); + void FillPromoDictionary(base::DictionaryValue* value); // Callback for the "getApps" message. - void HandleGetApps(const ListValue* args); + void HandleGetApps(const base::ListValue* args); // Callback for the "launchApp" message. - void HandleLaunchApp(const ListValue* args); + void HandleLaunchApp(const base::ListValue* args); // Callback for the "setLaunchType" message. - void HandleSetLaunchType(const ListValue* args); + void HandleSetLaunchType(const base::ListValue* args); // Callback for the "uninstallApp" message. - void HandleUninstallApp(const ListValue* args); + void HandleUninstallApp(const base::ListValue* args); // Callback for the "hideAppPromo" message. - void HandleHideAppsPromo(const ListValue* args); + void HandleHideAppsPromo(const base::ListValue* args); // Callback for the "createAppShortcut" message. - void HandleCreateAppShortcut(const ListValue* args); + void HandleCreateAppShortcut(const base::ListValue* args); // Callback for the "reorderApps" message. - void HandleReorderApps(const ListValue* args); + void HandleReorderApps(const base::ListValue* args); // Callback for the "setPageIndex" message. - void HandleSetPageIndex(const ListValue* args); + void HandleSetPageIndex(const base::ListValue* args); // Callback for the "promoSeen" message. - void HandlePromoSeen(const ListValue* args); + void HandlePromoSeen(const base::ListValue* args); // Callback for the "saveAppPageName" message. - void HandleSaveAppPageName(const ListValue* args); + void HandleSaveAppPageName(const base::ListValue* args); // Register app launcher preferences. static void RegisterUserPrefs(PrefService* pref_service); diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index 557cb96..30c40f0 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h @@ -14,9 +14,12 @@ #include "content/browser/webui/web_ui.h" class GURL; -class ListValue; class Profile; +namespace base { +class ListValue; +} + class FaviconWebUIHandler : public WebUIMessageHandler { public: FaviconWebUIHandler(); @@ -25,7 +28,7 @@ class FaviconWebUIHandler : public WebUIMessageHandler { // WebUIMessageHandler virtual void RegisterMessages(); - void HandleGetFaviconDominantColor(const ListValue* args); + void HandleGetFaviconDominantColor(const base::ListValue* args); private: // Called when favicon data is available from the history backend. diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.h b/chrome/browser/ui/webui/ntp/most_visited_handler.h index 4e037b8..bad04c3 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.h +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.h @@ -16,10 +16,13 @@ #include "content/common/notification_registrar.h" class GURL; -class ListValue; class PageUsageData; class PrefService; + +namespace base { +class ListValue; class Value; +} // The handler for Javascript messages related to the "most visited" view. // @@ -43,22 +46,22 @@ class MostVisitedHandler : public WebUIMessageHandler, virtual void RegisterMessages(); // Callback for the "getMostVisited" message. - void HandleGetMostVisited(const ListValue* args); + void HandleGetMostVisited(const base::ListValue* args); // Callback for the "blacklistURLFromMostVisited" message. - void HandleBlacklistURL(const ListValue* args); + void HandleBlacklistURL(const base::ListValue* args); // Callback for the "removeURLsFromMostVisitedBlacklist" message. - void HandleRemoveURLsFromBlacklist(const ListValue* args); + void HandleRemoveURLsFromBlacklist(const base::ListValue* args); // Callback for the "clearMostVisitedURLsBlacklist" message. - void HandleClearBlacklist(const ListValue* args); + void HandleClearBlacklist(const base::ListValue* args); // Callback for the "addPinnedURL" message. - void HandleAddPinnedURL(const ListValue* args); + void HandleAddPinnedURL(const base::ListValue* args); // Callback for the "removePinnedURL" message. - void HandleRemovePinnedURL(const ListValue* args); + void HandleRemovePinnedURL(const base::ListValue* args); // NotificationObserver implementation. virtual void Observe(int type, @@ -125,7 +128,7 @@ class MostVisitedHandler : public WebUIMessageHandler, bool got_first_most_visited_request_; // Keep the results of the db query here. - scoped_ptr<ListValue> pages_value_; + scoped_ptr<base::ListValue> pages_value_; DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler); }; diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index 90198bb..debb24f 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h @@ -12,7 +12,9 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "content/browser/webui/web_ui.h" +namespace base { class ListValue; +} // Sends sync-state changes to the New Tab Page for UI updating and forwards // link clicks on the page to the sync service. @@ -27,9 +29,9 @@ class NewTabPageSyncHandler : public WebUIMessageHandler, virtual void RegisterMessages(); // Callback for "GetSyncMessage". - void HandleGetSyncMessage(const ListValue* args); + void HandleGetSyncMessage(const base::ListValue* args); // Callback for "SyncLinkClicked". - void HandleSyncLinkClicked(const ListValue* args); + void HandleSyncLinkClicked(const base::ListValue* args); // ProfileSyncServiceObserver virtual void OnStateChanged(); diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index cc27f6a..ddb5f05 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -43,7 +43,7 @@ class NewTabUI : public ChromeWebUI, // Adds "url", "title", and "direction" keys on incoming dictionary, setting // title as the url as a fallback on empty title. - static void SetURLTitleAndDirection(DictionaryValue* dictionary, + static void SetURLTitleAndDirection(base::DictionaryValue* dictionary, const string16& title, const GURL& gurl); @@ -51,7 +51,7 @@ class NewTabUI : public ChromeWebUI, // by the NTP and adds them to the given list value. static void AddRecentlyClosedEntries( const TabRestoreService::Entries& entries, - ListValue* entry_list_value); + base::ListValue* entry_list_value); // The current preference version. static int current_pref_version() { return current_pref_version_; } diff --git a/chrome/browser/ui/webui/ntp/shown_sections_handler.h b/chrome/browser/ui/webui/ntp/shown_sections_handler.h index 9571f792..fb23f98 100644 --- a/chrome/browser/ui/webui/ntp/shown_sections_handler.h +++ b/chrome/browser/ui/webui/ntp/shown_sections_handler.h @@ -11,9 +11,12 @@ #include "content/common/notification_observer.h" class Extension; -class Value; class PrefService; +namespace base { +class Value; +} + // Use for the shown sections bitmask. // Currently, only the THUMB and APPS sections can be toggled by the user. Other // sections are shown automatically if they have data, and hidden otherwise. @@ -55,10 +58,10 @@ class ShownSectionsHandler : public WebUIMessageHandler, const NotificationDetails& details); // Callback for "getShownSections" message. - void HandleGetShownSections(const ListValue* args); + void HandleGetShownSections(const base::ListValue* args); // Callback for "setShownSections" message. - void HandleSetShownSections(const ListValue* args); + void HandleSetShownSections(const base::ListValue* args); static void RegisterUserPrefs(PrefService* pref_service); diff --git a/chrome/browser/ui/webui/options/about_page_handler.h b/chrome/browser/ui/webui/options/about_page_handler.h index 73dc0b3..9982658 100644 --- a/chrome/browser/ui/webui/options/about_page_handler.h +++ b/chrome/browser/ui/webui/options/about_page_handler.h @@ -21,23 +21,23 @@ class AboutPageHandler : public OptionsPageUIHandler { virtual ~AboutPageHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void RegisterMessages(); private: // The function is called from JavaScript when the about page is ready. - void PageReady(const ListValue* args); + void PageReady(const base::ListValue* args); // The function is called from JavaScript to set the release track like // "beta-channel" and "dev-channel". - void SetReleaseTrack(const ListValue* args); + void SetReleaseTrack(const base::ListValue* args); #if defined(OS_CHROMEOS) // Initiates update check. - void CheckNow(const ListValue* args); + void CheckNow(const base::ListValue* args); // Restarts the system. - void RestartNow(const ListValue* args); + void RestartNow(const base::ListValue* args); // Callback from chromeos::VersionLoader giving the version. void OnOSVersion(chromeos::VersionLoader::Handle handle, diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h index a9a9f74..56991f2 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.h +++ b/chrome/browser/ui/webui/options/autofill_options_handler.h @@ -11,8 +11,10 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; class ListValue; +} class AutofillOptionsHandler : public OptionsPageUIHandler, public PersonalDataManager::Observer { @@ -21,7 +23,7 @@ class AutofillOptionsHandler : public OptionsPageUIHandler, virtual ~AutofillOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); virtual void RegisterMessages(); @@ -30,50 +32,50 @@ class AutofillOptionsHandler : public OptionsPageUIHandler, private: // Loads the strings for the address and credit card overlays. - void SetAddressOverlayStrings(DictionaryValue* localized_strings); - void SetCreditCardOverlayStrings(DictionaryValue* localized_strings); + void SetAddressOverlayStrings(base::DictionaryValue* localized_strings); + void SetCreditCardOverlayStrings(base::DictionaryValue* localized_strings); // Loads Autofill addresses and credit cards using the PersonalDataManager. void LoadAutofillData(); // Removes an address from the PersonalDataManager. // |args| - A string, the GUID of the address to remove. - void RemoveAddress(const ListValue* args); + void RemoveAddress(const base::ListValue* args); // Removes a credit card from the PersonalDataManager. // |args| - A string, the GUID of the credit card to remove. - void RemoveCreditCard(const ListValue* args); + void RemoveCreditCard(const base::ListValue* args); // Requests profile data for a specific address. Calls into WebUI with the // loaded profile data to open the address editor. // |args| - A string, the GUID of the address to load. - void LoadAddressEditor(const ListValue* args); + void LoadAddressEditor(const base::ListValue* args); // Requests profile data for a specific credit card. Calls into WebUI with the // loaded profile data to open the credit card editor. // |args| - A string, the GUID of the credit card to load. - void LoadCreditCardEditor(const ListValue* args); + void LoadCreditCardEditor(const base::ListValue* args); // Adds or updates an address, depending on the GUID of the profile. If the // GUID is empty, a new address is added to the WebDatabase; otherwise, the // address with the matching GUID is updated. Called from WebUI. // |args| - an array containing the GUID of the address followed by the // address data. - void SetAddress(const ListValue* args); + void SetAddress(const base::ListValue* args); // Adds or updates a credit card, depending on the GUID of the profile. If the // GUID is empty, a new credit card is added to the WebDatabase; otherwise, // the credit card with the matching GUID is updated. Called from WebUI. // |args| - an array containing the GUID of the credit card followed by the // credit card data. - void SetCreditCard(const ListValue* args); + void SetCreditCard(const base::ListValue* args); // Validates a list of phone/fax numbers. The resulting validated list of // numbers is then sent back to the WebUI. // |args| - an array containing the index of the modified or added number, the // array of numbers, and the country code string set on the profile. - void ValidatePhoneNumbers(const ListValue* args); - void ValidateFaxNumbers(const ListValue* args); + void ValidatePhoneNumbers(const base::ListValue* args); + void ValidateFaxNumbers(const base::ListValue* args); // The personal data manager, used to load Autofill profiles and credit cards. // Unowned pointer, may not be NULL. diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index f363be2..6ffa8e0 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h @@ -26,7 +26,7 @@ class CertificateManagerHandler : public OptionsPageUIHandler, virtual ~CertificateManagerHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void RegisterMessages(); // CertificateManagerModel::Observer implementation. @@ -38,20 +38,20 @@ class CertificateManagerHandler : public OptionsPageUIHandler, private: // View certificate. - void View(const ListValue* args); + void View(const base::ListValue* args); // Edit server certificate trust values. - void EditServer(const ListValue* args); + void EditServer(const base::ListValue* args); // Edit certificate authority trust values. The sequence goes like: // 1. user clicks edit button -> CertificateEditCaTrustOverlay.show -> // GetCATrust -> CertificateEditCaTrustOverlay.populateTrust // 2. user clicks ok -> EditCATrust -> CertificateEditCaTrustOverlay.dismiss - void GetCATrust(const ListValue* args); - void EditCATrust(const ListValue* args); + void GetCATrust(const base::ListValue* args); + void EditCATrust(const base::ListValue* args); // Cleanup state stored during import or export process. - void CancelImportExportProcess(const ListValue* args); + void CancelImportExportProcess(const base::ListValue* args); void ImportExportCleanup(); // Export to PKCS #12 file. The sequence goes like: @@ -65,10 +65,10 @@ class CertificateManagerHandler : public OptionsPageUIHandler, // 4. slots unlocked -> ExportPersonalSlotsUnlocked -> exports to memory // buffer -> starts async write operation // 5. write finishes (or fails) -> ExportPersonalFileWritten - void ExportPersonal(const ListValue* args); - void ExportAllPersonal(const ListValue* args); + void ExportPersonal(const base::ListValue* args); + void ExportAllPersonal(const base::ListValue* args); void ExportPersonalFileSelected(const FilePath& path); - void ExportPersonalPasswordSelected(const ListValue* args); + void ExportPersonalPasswordSelected(const base::ListValue* args); void ExportPersonalSlotsUnlocked(); void ExportPersonalFileWritten(int write_errno, int bytes_written); @@ -85,9 +85,9 @@ class CertificateManagerHandler : public OptionsPageUIHandler, // 6a. if import succeeds -> ImportExportCleanup // 6b. if import fails -> show error, ImportExportCleanup // TODO(mattm): allow retrying with different password - void StartImportPersonal(const ListValue* args); + void StartImportPersonal(const base::ListValue* args); void ImportPersonalFileSelected(const FilePath& path); - void ImportPersonalPasswordSelected(const ListValue* args); + void ImportPersonalPasswordSelected(const base::ListValue* args); void ImportPersonalFileRead(int read_errno, std::string data); void ImportPersonalSlotUnlocked(); @@ -97,7 +97,7 @@ class CertificateManagerHandler : public OptionsPageUIHandler, // 3. read completes -> ImportServerFileRead -> parse certs -> attempt import // 4a. if import succeeds -> ImportExportCleanup // 4b. if import fails -> show error, ImportExportCleanup - void ImportServer(const ListValue* args); + void ImportServer(const base::ListValue* args); void ImportServerFileSelected(const FilePath& path); void ImportServerFileRead(int read_errno, std::string data); @@ -109,19 +109,19 @@ class CertificateManagerHandler : public OptionsPageUIHandler, // 4. user clicks ok -> ImportCATrustSelected -> attempt import // 5a. if import succeeds -> ImportExportCleanup // 5b. if import fails -> show error, ImportExportCleanup - void ImportCA(const ListValue* args); + void ImportCA(const base::ListValue* args); void ImportCAFileSelected(const FilePath& path); void ImportCAFileRead(int read_errno, std::string data); - void ImportCATrustSelected(const ListValue* args); + void ImportCATrustSelected(const base::ListValue* args); // Export a certificate. - void Export(const ListValue* args); + void Export(const base::ListValue* args); // Delete certificate and private key (if any). - void Delete(const ListValue* args); + void Delete(const base::ListValue* args); // Populate the trees in all the tabs. - void Populate(const ListValue* args); + void Populate(const base::ListValue* args); // Populate the given tab's tree. void PopulateTree(const std::string& tab_name, net::CertType type); @@ -138,7 +138,7 @@ class CertificateManagerHandler : public OptionsPageUIHandler, #if defined(OS_CHROMEOS) // Check whether Tpm token is ready and notifiy JS side. - void CheckTpmTokenReady(const ListValue* args); + void CheckTpmTokenReady(const base::ListValue* args); #endif gfx::NativeWindow GetParentWindow() const; diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h index 862acf5..4708c9b 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h @@ -22,17 +22,17 @@ class AccountsOptionsHandler : public CrosOptionsPageUIHandler { virtual void RegisterMessages(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); private: UserCrosSettingsProvider* users_settings() const; // Javascript callbacks to whitelist/unwhitelist user. - void WhitelistUser(const ListValue* args); - void UnwhitelistUser(const ListValue* args); + void WhitelistUser(const base::ListValue* args); + void UnwhitelistUser(const base::ListValue* args); // Javascript callback to auto add existing users to white list. - void WhitelistExistingUsers(const ListValue* args); + void WhitelistExistingUsers(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(AccountsOptionsHandler); }; diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h index bf71207..3f1e231 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h @@ -9,8 +9,10 @@ #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/gfx/native_widget_types.h" +namespace base { class DictionaryValue; class ListValue; +} namespace chromeos { @@ -22,23 +24,23 @@ class ChangePictureOptionsHandler : public OptionsPageUIHandler, virtual ~ChangePictureOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // WebUIMessageHandler implementation. virtual void RegisterMessages(); private: // Opens a file selection dialog to choose user image from file. - void ChooseFile(const ListValue* args); + void ChooseFile(const base::ListValue* args); // Opens the camera capture dialog. - void TakePhoto(const ListValue* args); + void TakePhoto(const base::ListValue* args); // Gets the list of available user images and sends it to the page. - void GetAvailableImages(const ListValue* args); + void GetAvailableImages(const base::ListValue* args); // Selects one of the available images as user's. - void SelectImage(const ListValue* args); + void SelectImage(const base::ListValue* args); // SelectFileDialog::Delegate implementation. virtual void FileSelected(const FilePath& path, int index, void* params); diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h index 0501514..fda593c 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h @@ -19,7 +19,7 @@ class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon { virtual ~CrosLanguageOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // DOMMessageHandler implementation. virtual void RegisterMessages(); @@ -33,14 +33,14 @@ class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon { // // Note that true in languageCodeSet does not mean anything. We just use // the dictionary as a set. - static ListValue* GetInputMethodList( + static base::ListValue* GetInputMethodList( const input_method::InputMethodDescriptors& descriptors); // Gets the list of languages from the given input descriptors. // The return value will look like: // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'}, // ...] - static ListValue* GetLanguageList( + static base::ListValue* GetLanguageList( const input_method::InputMethodDescriptors& descriptors); private: @@ -49,19 +49,19 @@ class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon { virtual void SetApplicationLocale(const std::string& language_code); // Called when the sign-out button is clicked. - void RestartCallback(const ListValue* args); + void RestartCallback(const base::ListValue* args); // Called when the input method is disabled. // |args| will contain the input method ID as string (ex. "mozc"). - void InputMethodDisableCallback(const ListValue* args); + void InputMethodDisableCallback(const base::ListValue* args); // Called when the input method is enabled. // |args| will contain the input method ID as string (ex. "mozc"). - void InputMethodEnableCallback(const ListValue* args); + void InputMethodEnableCallback(const base::ListValue* args); // Called when the input method options page is opened. // |args| will contain the input method ID as string (ex. "mozc"). - void InputMethodOptionsOpenCallback(const ListValue* args); + void InputMethodOptionsOpenCallback(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(CrosLanguageOptionsHandler); }; diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h index ff86de2..cf0fb22 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h @@ -28,7 +28,7 @@ class InternetOptionsHandler virtual ~InternetOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); // WebUIMessageHandler implementation. @@ -58,7 +58,7 @@ class InternetOptionsHandler // 'forget' // Handle{Wifi,Cellular}ButtonClick handles button click on a wireless // network item and a cellular network item respectively. - void ButtonClickCallback(const ListValue* args); + void ButtonClickCallback(const base::ListValue* args); void HandleWifiButtonClick(const std::string& service_path, const std::string& command); void HandleCellularButtonClick(const std::string& service_path, @@ -69,61 +69,61 @@ class InternetOptionsHandler // Initiates cellular plan data refresh. The results from libcros will be // passed through CellularDataPlanChanged() callback method. // |args| will be [ service_path ] - void RefreshCellularPlanCallback(const ListValue* args); + void RefreshCellularPlanCallback(const base::ListValue* args); void SetActivationButtonVisibility( const chromeos::CellularNetwork* cellular, - DictionaryValue* dictionary); - - void SetAutoConnectCallback(const ListValue* args); - void SetSharedCallback(const ListValue* args); - void SetIPConfigCallback(const ListValue* args); - void EnableWifiCallback(const ListValue* args); - void DisableWifiCallback(const ListValue* args); - void EnableCellularCallback(const ListValue* args); - void DisableCellularCallback(const ListValue* args); - void BuyDataPlanCallback(const ListValue* args); - void SetApnCallback(const ListValue* args); - void SetSimCardLockCallback(const ListValue* args); - void ChangePinCallback(const ListValue* args); - void ShareNetworkCallback(const ListValue* args); + base::DictionaryValue* dictionary); + + void SetAutoConnectCallback(const base::ListValue* args); + void SetSharedCallback(const base::ListValue* args); + void SetIPConfigCallback(const base::ListValue* args); + void EnableWifiCallback(const base::ListValue* args); + void DisableWifiCallback(const base::ListValue* args); + void EnableCellularCallback(const base::ListValue* args); + void DisableCellularCallback(const base::ListValue* args); + void BuyDataPlanCallback(const base::ListValue* args); + void SetApnCallback(const base::ListValue* args); + void SetSimCardLockCallback(const base::ListValue* args); + void ChangePinCallback(const base::ListValue* args); + void ShareNetworkCallback(const base::ListValue* args); // Populates the ui with the details of the given device path. This forces // an overlay to be displayed in the UI. void PopulateDictionaryDetails(const chromeos::Network* network); void PopulateWifiDetails(const chromeos::WifiNetwork* wifi, - DictionaryValue* dictionary); + base::DictionaryValue* dictionary); void PopulateCellularDetails(const chromeos::CellularNetwork* cellular, - DictionaryValue* dictionary); + base::DictionaryValue* dictionary); void PopulateVPNDetails(const chromeos::VirtualNetwork* vpn, - DictionaryValue* dictionary); + base::DictionaryValue* dictionary); // Converts CellularDataPlan structure into dictionary for JS. Formats plan // settings into human readable texts. - DictionaryValue* CellularDataPlanToDictionary( + base::DictionaryValue* CellularDataPlanToDictionary( const chromeos::CellularDataPlan* plan); // Creates the map of a network. - ListValue* GetNetwork(const std::string& service_path, - const SkBitmap& icon, - const std::string& name, - bool connecting, - bool connected, - bool connectable, - chromeos::ConnectionType connection_type, - bool remembered, - bool shared, - chromeos::ActivationState activation_state, - bool restricted_ip); + base::ListValue* GetNetwork(const std::string& service_path, + const SkBitmap& icon, + const std::string& name, + bool connecting, + bool connected, + bool connectable, + chromeos::ConnectionType connection_type, + bool remembered, + bool shared, + chromeos::ActivationState activation_state, + bool restricted_ip); // Creates the map of wired networks. - ListValue* GetWiredList(); + base::ListValue* GetWiredList(); // Creates the map of wireless networks. - ListValue* GetWirelessList(); + base::ListValue* GetWirelessList(); // Creates the map of virtual networks. - ListValue* GetVPNList(); + base::ListValue* GetVPNList(); // Creates the map of remembered networks. - ListValue* GetRememberedList(); + base::ListValue* GetRememberedList(); // Fills network information into JS dictionary for displaying network lists. - void FillNetworkInfo(DictionaryValue* dictionary); + void FillNetworkInfo(base::DictionaryValue* dictionary); // Refreshes the display of network information. void RefreshNetworkData(); // Adds observers for wireless networks, if any, so that we can dynamically diff --git a/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h index 979a0fa..2b32f43 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h @@ -10,7 +10,9 @@ #include "base/compiler_specific.h" #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; +} namespace chromeos { @@ -21,7 +23,8 @@ class LanguageChewingHandler : public OptionsPageUIHandler { virtual ~LanguageChewingHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE; + virtual void GetLocalizedValues( + base::DictionaryValue* localized_strings) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(LanguageChewingHandler); diff --git a/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h index 28c7a6c..9fd58fd 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h @@ -8,8 +8,10 @@ #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; class ListValue; +} namespace chromeos { @@ -20,11 +22,11 @@ class LanguageHangulHandler : public OptionsPageUIHandler { virtual ~LanguageHangulHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); private: // Returns the list of hangul keyboards. - static ListValue* GetKeyboardLayoutList(); + static base::ListValue* GetKeyboardLayoutList(); DISALLOW_COPY_AND_ASSIGN(LanguageHangulHandler); }; diff --git a/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h index e1a5419..a9a74a5 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h @@ -8,7 +8,9 @@ #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; +} namespace chromeos { @@ -19,7 +21,7 @@ class LanguageMozcHandler : public OptionsPageUIHandler { virtual ~LanguageMozcHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); private: DISALLOW_COPY_AND_ASSIGN(LanguageMozcHandler); diff --git a/chrome/browser/ui/webui/options/chromeos/language_options_util.h b/chrome/browser/ui/webui/options/chromeos/language_options_util.h index 49e10da..ba2bb9a 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_options_util.h +++ b/chrome/browser/ui/webui/options/chromeos/language_options_util.h @@ -13,7 +13,9 @@ #include "chrome/browser/chromeos/language_preferences.h" #include "ui/base/l10n/l10n_util.h" +namespace base { class ListValue; +} namespace chromeos { @@ -52,7 +54,7 @@ Value* CreateValue(int in_value); // Creates a multiple choice list from the given preference. template <typename T> -ListValue* CreateMultipleChoiceList( +base::ListValue* CreateMultipleChoiceList( const language_prefs::LanguageMultipleChoicePreference<T>& preference) { int list_length = 0; for (size_t i = 0; @@ -64,12 +66,12 @@ ListValue* CreateMultipleChoiceList( } DCHECK_GT(list_length, 0); - ListValue* list_value = new ListValue(); + base::ListValue* list_value = new base::ListValue(); for (int i = 0; i < list_length; ++i) { - ListValue* option = new ListValue(); + base::ListValue* option = new base::ListValue(); option->Append(CreateValue( preference.values_and_ids[i].ibus_config_value)); - option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16( + option->Append(base::Value::CreateStringValue(l10n_util::GetStringUTF16( preference.values_and_ids[i].item_message_id))); list_value->Append(option); } diff --git a/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h index 270ef2c..bd86aaa 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h @@ -8,7 +8,9 @@ #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; +} namespace chromeos { @@ -19,7 +21,7 @@ class LanguagePinyinHandler : public OptionsPageUIHandler { virtual ~LanguagePinyinHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); private: DISALLOW_COPY_AND_ASSIGN(LanguagePinyinHandler); diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h index 73ce560..c13bf31 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h @@ -16,7 +16,7 @@ class ProxyHandler : public CrosOptionsPageUIHandler { virtual ~ProxyHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); private: diff --git a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h index af2963d..564e4d0 100644 --- a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h @@ -21,7 +21,7 @@ class StatsOptionsHandler : public CrosOptionsPageUIHandler { StatsOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); // WebUIMessageHandler implementation. @@ -29,7 +29,7 @@ class StatsOptionsHandler : public CrosOptionsPageUIHandler { private: MetricsCrosSettingsProvider* provider() const; - void HandleMetricsReportingCheckbox(const ListValue* args); + void HandleMetricsReportingCheckbox(const base::ListValue* args); void SetupMetricsReportingCheckbox(bool user_changed); DISALLOW_COPY_AND_ASSIGN(StatsOptionsHandler); diff --git a/chrome/browser/ui/webui/options/chromeos/system_options_handler.h b/chrome/browser/ui/webui/options/chromeos/system_options_handler.h index 463e56b..61d451c 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.h @@ -8,7 +8,9 @@ #include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h" +namespace base { class DictionaryValue; +} // ChromeOS system options page UI handler. class SystemOptionsHandler : public chromeos::CrosOptionsPageUIHandler { @@ -17,7 +19,7 @@ class SystemOptionsHandler : public chromeos::CrosOptionsPageUIHandler { virtual ~SystemOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); virtual void RegisterMessages(); @@ -25,7 +27,7 @@ class SystemOptionsHandler : public chromeos::CrosOptionsPageUIHandler { // Called when the accessibility checkbox value is changed. // |args| will contain the checkbox checked state as a string // ("true" or "false"). - void AccessibilityChangeCallback(const ListValue* args); + void AccessibilityChangeCallback(const base::ListValue* args); private: DISALLOW_COPY_AND_ASSIGN(SystemOptionsHandler); diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h index afc7fa9..f6311d4 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h @@ -12,8 +12,10 @@ #include "chrome/browser/chromeos/system/timezone_settings.h" #include "third_party/icu/public/i18n/unicode/timezone.h" +namespace base { class Value; class ListValue; +} namespace chromeos { @@ -24,18 +26,18 @@ class SystemSettingsProvider : public CrosSettingsProvider, virtual ~SystemSettingsProvider(); // CrosSettingsProvider overrides. - virtual bool Get(const std::string& path, Value** out_value) const; + virtual bool Get(const std::string& path, base::Value** out_value) const; virtual bool HandlesSetting(const std::string& path); // Overridden from TimezoneSettings::Observer: virtual void TimezoneChanged(const icu::TimeZone& timezone); // Creates the map of timezones used by the options page. - ListValue* GetTimezoneList(); + base::ListValue* GetTimezoneList(); private: // CrosSettingsProvider overrides. - virtual void DoSet(const std::string& path, Value* in_value); + virtual void DoSet(const std::string& path, base::Value* in_value); // Gets timezone name. static string16 GetTimezoneName(const icu::TimeZone& timezone); diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.h b/chrome/browser/ui/webui/options/cookies_view_handler.h index 7b88bdd..456bb350 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.h +++ b/chrome/browser/ui/webui/options/cookies_view_handler.h @@ -18,7 +18,7 @@ class CookiesViewHandler : public OptionsPageUIHandler, virtual ~CookiesViewHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void RegisterMessages(); // CookiesTreeModel::Observer implementation. @@ -40,17 +40,17 @@ class CookiesViewHandler : public OptionsPageUIHandler, void EnsureCookiesTreeModelCreated(); // Updates search filter for cookies tree model. - void UpdateSearchResults(const ListValue* args); + void UpdateSearchResults(const base::ListValue* args); // Remove all sites data. - void RemoveAll(const ListValue* args); + void RemoveAll(const base::ListValue* args); // Remove selected sites data. - void Remove(const ListValue* args); + void Remove(const base::ListValue* args); // Get the tree node using the tree path info in |args| and call // SendChildren to pass back children nodes data to WebUI. - void LoadChildren(const ListValue* args); + void LoadChildren(const base::ListValue* args); // Get children nodes data and pass it to 'CookiesView.loadChildren' to // update the WebUI. diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h index c30e320..5ec4a14 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.h +++ b/chrome/browser/ui/webui/options/extension_settings_handler.h @@ -20,15 +20,18 @@ #include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" -class DictionaryValue; class Extension; class ExtensionService; class FilePath; -class ListValue; class PrefService; class RenderProcessHost; class UserScript; +namespace base { +class DictionaryValue; +class ListValue; +} + // Information about a page running in an extension, for example a toolstrip, // a background page, or a tab contents. struct ExtensionPage { @@ -84,7 +87,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, // Load |icons|. Will call handler->OnIconsLoaded when complete. IconLoader // takes ownership of both arguments. void LoadIcons(std::vector<ExtensionResource>* icons, - DictionaryValue* json); + base::DictionaryValue* json); // Cancel the load. IconLoader won't try to call back to the handler after // this. @@ -94,10 +97,10 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, // Load the icons and call ReportResultOnUIThread when done. This method // takes ownership of both arguments. void LoadIconsOnFileThread(std::vector<ExtensionResource>* icons, - DictionaryValue* json); + base::DictionaryValue* json); // Report back to the handler. This method takes ownership of |json|. - void ReportResultOnUIThread(DictionaryValue* json); + void ReportResultOnUIThread(base::DictionaryValue* json); // The handler we will report back to. ExtensionsDOMHandler* handler_; @@ -111,7 +114,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, // Extension Detail JSON Struct for page. (static for ease of testing). // Note: service can be NULL in unit tests. - static DictionaryValue* CreateExtensionDetailValue( + static base::DictionaryValue* CreateExtensionDetailValue( ExtensionService* service, const Extension* extension, const std::vector<ExtensionPage>& pages, @@ -119,7 +122,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, bool terminated); // ContentScript JSON Struct for page. (static for ease of testing). - static DictionaryValue* CreateContentScriptDetailValue( + static base::DictionaryValue* CreateContentScriptDetailValue( const UserScript& script, const FilePath& extension_path); @@ -135,52 +138,52 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, private: // Callback for "requestExtensionsData" message. - void HandleRequestExtensionsData(const ListValue* args); + void HandleRequestExtensionsData(const base::ListValue* args); // Callback for "toggleDeveloperMode" message. - void HandleToggleDeveloperMode(const ListValue* args); + void HandleToggleDeveloperMode(const base::ListValue* args); // Callback for "inspect" message. - void HandleInspectMessage(const ListValue* args); + void HandleInspectMessage(const base::ListValue* args); // Callback for "reload" message. - void HandleReloadMessage(const ListValue* args); + void HandleReloadMessage(const base::ListValue* args); // Callback for "enable" message. - void HandleEnableMessage(const ListValue* args); + void HandleEnableMessage(const base::ListValue* args); // Callback for "enableIncognito" message. - void HandleEnableIncognitoMessage(const ListValue* args); + void HandleEnableIncognitoMessage(const base::ListValue* args); // Callback for "allowFileAcces" message. - void HandleAllowFileAccessMessage(const ListValue* args); + void HandleAllowFileAccessMessage(const base::ListValue* args); // Callback for "uninstall" message. - void HandleUninstallMessage(const ListValue* args); + void HandleUninstallMessage(const base::ListValue* args); // Callback for "options" message. - void HandleOptionsMessage(const ListValue* args); + void HandleOptionsMessage(const base::ListValue* args); // Callback for "showButton" message. - void HandleShowButtonMessage(const ListValue* args); + void HandleShowButtonMessage(const base::ListValue* args); // Callback for "load" message. - void HandleLoadMessage(const ListValue* args); + void HandleLoadMessage(const base::ListValue* args); // Callback for "pack" message. - void HandlePackMessage(const ListValue* args); + void HandlePackMessage(const base::ListValue* args); // Callback for "autoupdate" message. - void HandleAutoUpdateMessage(const ListValue* args); + void HandleAutoUpdateMessage(const base::ListValue* args); // Utility for calling javascript window.alert in the page. void ShowAlert(const std::string& message); // Callback for "selectFilePath" message. - void HandleSelectFilePathMessage(const ListValue* args); + void HandleSelectFilePathMessage(const base::ListValue* args); // Utility for callbacks that get an extension ID as the sole argument. - const Extension* GetExtension(const ListValue* args); + const Extension* GetExtension(const base::ListValue* args); // Forces a UI update if appropriate after a notification is received. void MaybeUpdateAfterNotification(); @@ -213,11 +216,11 @@ class ExtensionsDOMHandler : public WebUIMessageHandler, // Takes ownership of |icons|. // Called on the file thread. void LoadExtensionIcons(std::vector<ExtensionResource>* icons, - DictionaryValue* json_data); + base::DictionaryValue* json_data); // Takes ownership of |json_data| and tells HTML about it. // Called on the UI thread. - void OnIconsLoaded(DictionaryValue* json_data); + void OnIconsLoaded(base::DictionaryValue* json_data); // Returns the ExtensionUninstallDialog object for this class, creating it if // needed. diff --git a/chrome/browser/ui/webui/options/font_settings_utils.h b/chrome/browser/ui/webui/options/font_settings_utils.h index 2a36bad..ce133b4 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils.h +++ b/chrome/browser/ui/webui/options/font_settings_utils.h @@ -8,7 +8,6 @@ #include "base/basictypes.h" -class ListValue; class PrefService; // Chrome advanced options utility methods. diff --git a/chrome/browser/ui/webui/options/handler_options_handler.h b/chrome/browser/ui/webui/options/handler_options_handler.h index 69baf75..f7cb567 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.h +++ b/chrome/browser/ui/webui/options/handler_options_handler.h @@ -12,7 +12,9 @@ #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/common/notification_registrar.h" +namespace base { class DictionaryValue; +} class HandlerOptionsHandler : public OptionsPageUIHandler { public: @@ -20,7 +22,7 @@ class HandlerOptionsHandler : public OptionsPageUIHandler { virtual ~HandlerOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); virtual void RegisterMessages(); @@ -46,7 +48,7 @@ class HandlerOptionsHandler : public OptionsPageUIHandler { // Returns a JSON object describing the set of protocol handlers for the // given protocol. - DictionaryValue* GetHandlersForProtocol(const std::string& protocol); + base::DictionaryValue* GetHandlersForProtocol(const std::string& protocol); // Called when the JS PasswordManager object is initialized. void UpdateHandlerList(); diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h index 6f28fa3..3e18a10 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.h +++ b/chrome/browser/ui/webui/options/import_data_handler.h @@ -25,14 +25,14 @@ class ImportDataHandler : public OptionsPageUIHandler, virtual ~ImportDataHandler(); // OptionsPageUIHandler: - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); // WebUIMessageHandler: virtual void RegisterMessages(); private: - void ImportData(const ListValue* args); + void ImportData(const base::ListValue* args); // ImporterList::Observer: virtual void OnSourceProfilesLoaded() OVERRIDE; diff --git a/chrome/browser/ui/webui/options/language_options_handler.h b/chrome/browser/ui/webui/options/language_options_handler.h index 46ac1d4..908ef38 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.h +++ b/chrome/browser/ui/webui/options/language_options_handler.h @@ -16,7 +16,7 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon { virtual ~LanguageOptionsHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // WebUIMessageHandler implementation. virtual void RegisterMessages(); @@ -27,7 +27,7 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon { // The return value will look like: // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'}, // ...] - static ListValue* GetLanguageList(); + static base::ListValue* GetLanguageList(); private: // LanguageOptionsHandlerCommon implementation. @@ -35,7 +35,7 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon { virtual void SetApplicationLocale(const std::string& language_code); // Called when the restart button is clicked. - void RestartCallback(const ListValue* args); + void RestartCallback(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandler); }; diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.h b/chrome/browser/ui/webui/options/language_options_handler_common.h index a81a47f..b3c3e7b 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.h +++ b/chrome/browser/ui/webui/options/language_options_handler_common.h @@ -8,8 +8,10 @@ #include "chrome/browser/ui/webui/options/options_ui.h" +namespace base { class DictionaryValue; class ListValue; +} // The base class for language options page UI handlers. This class has code // common to the Chrome OS and non-Chrome OS implementation of the handler. @@ -19,7 +21,7 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler { virtual ~LanguageOptionsHandlerCommon(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // DOMMessageHandler implementation. virtual void RegisterMessages(); @@ -32,7 +34,7 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler { // // Note that true in values does not mean anything. We just use the // dictionary as a set. - static DictionaryValue* GetUILanguageCodeSet(); + static base::DictionaryValue* GetUILanguageCodeSet(); // Gets the set of language codes that can be used for spellchecking. // The return value will look like: @@ -40,7 +42,7 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler { // // Note that true in values does not mean anything. We just use the // dictionary as a set. - static DictionaryValue* GetSpellCheckLanguageCodeSet(); + static base::DictionaryValue* GetSpellCheckLanguageCodeSet(); private: // Returns the name of the product (ex. "Chrome" or "Chrome OS"). @@ -50,15 +52,15 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler { virtual void SetApplicationLocale(const std::string& language_code) = 0; // Called when the language options is opened. - void LanguageOptionsOpenCallback(const ListValue* args); + void LanguageOptionsOpenCallback(const base::ListValue* args); // Called when the UI language is changed. // |args| will contain the language code as string (ex. "fr"). - void UiLanguageChangeCallback(const ListValue* args); + void UiLanguageChangeCallback(const base::ListValue* args); // Called when the spell check language is changed. // |args| will contain the language code as string (ex. "fr"). - void SpellCheckLanguageChangeCallback(const ListValue* args); + void SpellCheckLanguageChangeCallback(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandlerCommon); }; diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index 1ebbfa9..d4a27f8 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h @@ -31,7 +31,7 @@ class OptionsPageUIHandler : public WebUIMessageHandler, virtual bool IsEnabled(); // Collects localized strings for options page. - virtual void GetLocalizedValues(DictionaryValue* localized_strings) = 0; + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings) = 0; // Initialize the page. Called once the DOM is available for manipulation. // This will be called only once. @@ -58,12 +58,12 @@ class OptionsPageUIHandler : public WebUIMessageHandler, int id; }; // A helper for simplifying the process of registering strings in WebUI. - static void RegisterStrings(DictionaryValue* localized_strings, + static void RegisterStrings(base::DictionaryValue* localized_strings, const OptionsStringResource* resources, size_t length); // Registers string resources for a page's header and tab title. - static void RegisterTitle(DictionaryValue* localized_strings, + static void RegisterTitle(base::DictionaryValue* localized_strings, const std::string& variable_name, int title_id); @@ -98,7 +98,7 @@ class OptionsUI : public ChromeWebUI, private: // Adds OptionsPageUiHandler to the handlers list if handler is enabled. - void AddOptionsPageUIHandler(DictionaryValue* localized_strings, + void AddOptionsPageUIHandler(base::DictionaryValue* localized_strings, OptionsPageUIHandler* handler); bool initialized_handlers_; diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.h b/chrome/browser/ui/webui/options/search_engine_manager_handler.h index 285d3c3..0e76065 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.h +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.h @@ -21,7 +21,7 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler, virtual void Initialize(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // ui::TableModelObserver implementation. virtual void OnModelChanged(); @@ -42,30 +42,30 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler, scoped_ptr<EditSearchEngineController> edit_controller_; // Removes the search engine at the given index. Called from WebUI. - void RemoveSearchEngine(const ListValue* args); + void RemoveSearchEngine(const base::ListValue* args); // Sets the search engine at the given index to be default. Called from WebUI. - void SetDefaultSearchEngine(const ListValue* args); + void SetDefaultSearchEngine(const base::ListValue* args); // Starts an edit session for the search engine at the given index. If the // index is -1, starts editing a new search engine instead of an existing one. // Called from WebUI. - void EditSearchEngine(const ListValue* args); + void EditSearchEngine(const base::ListValue* args); // Validates the given search engine values, and reports the results back // to WebUI. Called from WebUI. - void CheckSearchEngineInfoValidity(const ListValue* args); + void CheckSearchEngineInfoValidity(const base::ListValue* args); // Called when an edit is cancelled. // Called from WebUI. - void EditCancelled(const ListValue* args); + void EditCancelled(const base::ListValue* args); // Called when an edit is finished and should be saved. // Called from WebUI. - void EditCompleted(const ListValue* args); + void EditCompleted(const base::ListValue* args); // Returns a dictionary to pass to WebUI representing the given search engine. - DictionaryValue* CreateDictionaryForEngine(int index, bool is_default); + base::DictionaryValue* CreateDictionaryForEngine(int index, bool is_default); DISALLOW_COPY_AND_ASSIGN(SearchEngineManagerHandler); }; diff --git a/chrome/browser/ui/webui/options/stop_syncing_handler.h b/chrome/browser/ui/webui/options/stop_syncing_handler.h index 095f76c..251255f 100644 --- a/chrome/browser/ui/webui/options/stop_syncing_handler.h +++ b/chrome/browser/ui/webui/options/stop_syncing_handler.h @@ -14,13 +14,13 @@ class StopSyncingHandler : public OptionsPageUIHandler { virtual ~StopSyncingHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); // WebUIMessageHandler implementation. virtual void RegisterMessages(); private: - void StopSyncing(const ListValue* args); + void StopSyncing(const base::ListValue* args); DISALLOW_COPY_AND_ASSIGN(StopSyncingHandler); }; diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h index 8b9419d..50f9888 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.h +++ b/chrome/browser/ui/webui/options/sync_setup_handler.h @@ -17,16 +17,16 @@ class SyncSetupHandler : public OptionsPageUIHandler, virtual ~SyncSetupHandler(); // OptionsPageUIHandler implementation. - virtual void GetLocalizedValues(DictionaryValue* localized_strings); + virtual void GetLocalizedValues(base::DictionaryValue* localized_strings); virtual void Initialize(); virtual void RegisterMessages(); // SyncSetupFlowHandler implementation. - virtual void ShowGaiaLogin(const DictionaryValue& args); + virtual void ShowGaiaLogin(const base::DictionaryValue& args); virtual void ShowGaiaSuccessAndClose(); virtual void ShowGaiaSuccessAndSettingUp(); - virtual void ShowConfigure(const DictionaryValue& args); - virtual void ShowPassphraseEntry(const DictionaryValue& args); + virtual void ShowConfigure(const base::DictionaryValue& args); + virtual void ShowPassphraseEntry(const base::DictionaryValue& args); virtual void ShowSettingUp(); virtual void ShowSetupDone(const std::wstring& user); virtual void SetFlow(SyncSetupFlow* flow); @@ -47,14 +47,14 @@ class SyncSetupHandler : public OptionsPageUIHandler, // Callbacks from the page. Protected in order to be called by the // SyncSetupWizardTest. - void OnDidClosePage(const ListValue* args); - void HandleSubmitAuth(const ListValue* args); - void HandleConfigure(const ListValue* args); - void HandlePassphraseEntry(const ListValue* args); - void HandlePassphraseCancel(const ListValue* args); - void HandleAttachHandler(const ListValue* args); - void HandleShowErrorUI(const ListValue* args); - void HandleShowSetupUI(const ListValue* args); + void OnDidClosePage(const base::ListValue* args); + void HandleSubmitAuth(const base::ListValue* args); + void HandleConfigure(const base::ListValue* args); + void HandlePassphraseEntry(const base::ListValue* args); + void HandlePassphraseCancel(const base::ListValue* args); + void HandleAttachHandler(const base::ListValue* args); + void HandleShowErrorUI(const base::ListValue* args); + void HandleShowSetupUI(const base::ListValue* args); SyncSetupFlow* flow() { return flow_; } diff --git a/chrome/browser/ui/webui/print_preview_handler.h b/chrome/browser/ui/webui/print_preview_handler.h index 651a70f..510b81a 100644 --- a/chrome/browser/ui/webui/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview_handler.h @@ -13,9 +13,12 @@ #include "content/browser/webui/web_ui.h" class FilePath; -class FundamentalValue; class PrintSystemTaskProxy; + +namespace base { +class FundamentalValue; class StringValue; +} namespace printing { class PrintBackend; @@ -54,52 +57,52 @@ class PrintPreviewHandler : public WebUIMessageHandler, TabContents* preview_tab(); // Get the default printer. |args| is unused. - void HandleGetDefaultPrinter(const ListValue* args); + void HandleGetDefaultPrinter(const base::ListValue* args); // Get the list of printers. |args| is unused. - void HandleGetPrinters(const ListValue* args); + void HandleGetPrinters(const base::ListValue* args); // Ask the initiator renderer to generate a preview. // First element of |args| is a job settings JSON string. - void HandleGetPreview(const ListValue* args); + void HandleGetPreview(const base::ListValue* args); // Get the job settings from Web UI and initiate printing. // First element of |args| is a job settings JSON string. - void HandlePrint(const ListValue* args); + void HandlePrint(const base::ListValue* args); // Handles the request to hide the preview tab for printing. // |args| is unused. - void HandleHidePreview(const ListValue* args); + void HandleHidePreview(const base::ListValue* args); // Handles the request to cancel the pending print request. // |args| is unused. - void HandleCancelPendingPrintRequest(const ListValue* args); + void HandleCancelPendingPrintRequest(const base::ListValue* args); // Get the printer capabilities. // First element of |args| is the printer name. - void HandleGetPrinterCapabilities(const ListValue* args); + void HandleGetPrinterCapabilities(const base::ListValue* args); // Ask the initiator renderer to show the native print system dialog. // |args| is unused. - void HandleShowSystemDialog(const ListValue* args); + void HandleShowSystemDialog(const base::ListValue* args); // Ask the browser to show the native printer management dialog. // |args| is unused. - void HandleManagePrinters(const ListValue* args); + void HandleManagePrinters(const base::ListValue* args); // Ask the browser to close the preview tab. // |args| is unused. - void HandleClosePreviewTab(const ListValue* args); + void HandleClosePreviewTab(const base::ListValue* args); // Send the printer capabilities to the Web UI. // |settings_info| contains printer capabilities information. - void SendPrinterCapabilities(const DictionaryValue& settings_info); + void SendPrinterCapabilities(const base::DictionaryValue& settings_info); // Send the default printer to the Web UI. - void SendDefaultPrinter(const StringValue& default_printer); + void SendDefaultPrinter(const base::StringValue& default_printer); // Send the list of printers to the Web UI. - void SendPrinterList(const ListValue& printers); + void SendPrinterList(const base::ListValue& printers); // Helper function to get the initiator tab for the print preview tab. TabContents* GetInitiatorTab(); diff --git a/chrome/browser/ui/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h index 4c6ca5a..31157a4 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.h +++ b/chrome/browser/ui/webui/sync_internals_ui.h @@ -39,7 +39,7 @@ class SyncInternalsUI : public ChromeWebUI, // getAboutInfo() be handled by the sync service. virtual void OnWebUISend(const GURL& source_url, const std::string& name, - const ListValue& args) OVERRIDE; + const base::ListValue& args) OVERRIDE; // browser_sync::JsEventHandler implementation. virtual void HandleJsEvent( diff --git a/chrome/browser/ui/webui/task_manager_handler.h b/chrome/browser/ui/webui/task_manager_handler.h index e6b4901..14278b3 100644 --- a/chrome/browser/ui/webui/task_manager_handler.h +++ b/chrome/browser/ui/webui/task_manager_handler.h @@ -10,7 +10,9 @@ #include "content/browser/webui/web_ui.h" #include "chrome/browser/task_manager/task_manager.h" +namespace base { class ListValue; +} class TaskManagerHandler : public WebUIMessageHandler, public TaskManagerModelObserver { @@ -34,11 +36,11 @@ class TaskManagerHandler : public WebUIMessageHandler, virtual void RegisterMessages() OVERRIDE; // Callback for the "killProcess" message. - void HandleKillProcess(const ListValue* args); + void HandleKillProcess(const base::ListValue* args); - void EnableTaskManager(const ListValue* indexes); - void DisableTaskManager(const ListValue* indexes); - void OpenAboutMemory(const ListValue* indexes); + void EnableTaskManager(const base::ListValue* indexes); + void DisableTaskManager(const base::ListValue* indexes); + void OpenAboutMemory(const base::ListValue* indexes); private: // Models diff --git a/chrome/browser/ui/webui/textfields_ui.h b/chrome/browser/ui/webui/textfields_ui.h index bb39b08..d00ae2b 100644 --- a/chrome/browser/ui/webui/textfields_ui.h +++ b/chrome/browser/ui/webui/textfields_ui.h @@ -46,7 +46,7 @@ class TextfieldsDOMHandler : public WebUIMessageHandler { // Handles the "textfieldValue" call from the JavaScript. This call // synchonizes the value inside the JavaScript textfield with the copy in the // DOM object. - virtual void HandleTextfieldValue(const ListValue* args); + virtual void HandleTextfieldValue(const base::ListValue* args); protected: virtual void RegisterMessages(); diff --git a/chrome/browser/ui/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h index 635b0c0..fca2962 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.h +++ b/chrome/browser/ui/webui/web_ui_browsertest.h @@ -13,9 +13,12 @@ #include "chrome/test/in_process_browser_test.h" #include "chrome/test/test_navigation_observer.h" -class Value; class WebUIMessageHandler; +namespace base { +class Value; +} + // This macro simplifies the declaration of simple javascript unit tests. // Use: // WEB_UI_UNITTEST_F(MyWebUIPageTest, myJavascriptUnittest); @@ -34,7 +37,7 @@ class WebUIBrowserTest : public InProcessBrowserTest, public TestNavigationObserver::JsInjectionReadyObserver { public: - typedef std::vector<const Value*> ConstValueVector; + typedef std::vector<const base::Value*> ConstValueVector; virtual ~WebUIBrowserTest(); // Add a custom helper JS library for your test. @@ -46,10 +49,10 @@ class WebUIBrowserTest // Note that calls to functions in test_api.js are not supported. bool RunJavascriptFunction(const std::string& function_name); bool RunJavascriptFunction(const std::string& function_name, - const Value& arg); + const base::Value& arg); bool RunJavascriptFunction(const std::string& function_name, - const Value& arg1, - const Value& arg2); + const base::Value& arg1, + const base::Value& arg2); bool RunJavascriptFunction(const std::string& function_name, const ConstValueVector& function_arguments); @@ -60,10 +63,10 @@ class WebUIBrowserTest // Runs a test that may include calls to functions in test_api.js. bool RunJavascriptTest(const std::string& test_name); bool RunJavascriptTest(const std::string& test_name, - const Value& arg); + const base::Value& arg); bool RunJavascriptTest(const std::string& test_name, - const Value& arg1, - const Value& arg2); + const base::Value& arg1, + const base::Value& arg2); bool RunJavascriptTest(const std::string& test_name, const ConstValueVector& test_arguments); |