diff options
30 files changed, 54 insertions, 59 deletions
diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc index 1345cf1..beb1156 100644 --- a/chrome/browser/browser_url_handler.cc +++ b/chrome/browser/browser_url_handler.cc @@ -60,7 +60,7 @@ static bool ReverseViewSource(GURL* url, Profile* profile) { } // Handles rewriting Web UI URLs. -static bool HandleDOMUI(GURL* url, Profile* profile) { +static bool HandleWebUI(GURL* url, Profile* profile) { if (!WebUIFactory::UseWebUIForURL(profile, *url)) return false; @@ -99,7 +99,7 @@ void BrowserURLHandler::InitURLHandlers() { url_handlers_.push_back(HandlerPair(&WillHandleBrowserAboutURL, null_handler)); // chrome: & friends. - url_handlers_.push_back(HandlerPair(&HandleDOMUI, null_handler)); + url_handlers_.push_back(HandlerPair(&HandleWebUI, null_handler)); // view-source: url_handlers_.push_back(HandlerPair(&HandleViewSource, &ReverseViewSource)); } diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc index dc3b0c9..5969c40 100644 --- a/chrome/browser/chromeos/dom_ui/menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc @@ -641,7 +641,7 @@ ChromeURLDataManager::DataSource* MenuUI::CreateMenuUIHTMLSource( // static bool MenuUI::IsEnabled() { return CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableDOMUIMenu); + switches::kEnableWebUIMenu); } ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() { diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 200bc73..8ac9177 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -213,7 +213,7 @@ void BalloonViewImpl::Show(Balloon* balloon) { balloon_ = balloon; html_contents_ = new BalloonViewHost(balloon); if (dom_ui_) - html_contents_->EnableDOMUI(); + html_contents_->EnableWebUI(); AddChildView(html_contents_->view()); notification_registrar_.Add(this, NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon)); diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc index 091997c..5eac45d 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.cc +++ b/chrome/browser/dom_ui/constrained_html_ui.cc @@ -30,7 +30,7 @@ void ConstrainedHtmlUI::RenderViewCreated( HtmlDialogUIDelegate* dialog_delegate = delegate->GetHtmlDialogUIDelegate(); std::vector<WebUIMessageHandler*> handlers; dialog_delegate->GetWebUIMessageHandlers(&handlers); - render_view_host->SetDOMUIProperty("dialogArguments", + render_view_host->SetWebUIProperty("dialogArguments", dialog_delegate->GetDialogArgs()); for (std::vector<WebUIMessageHandler*>::iterator it = handlers.begin(); it != handlers.end(); ++it) { diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc index 766dfc9..33638f9 100644 --- a/chrome/browser/dom_ui/html_dialog_ui.cc +++ b/chrome/browser/dom_ui/html_dialog_ui.cc @@ -54,7 +54,7 @@ void HtmlDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { } if (0 != (bindings_ & BindingsPolicy::DOM_UI)) - render_view_host->SetDOMUIProperty("dialogArguments", dialog_args); + render_view_host->SetWebUIProperty("dialogArguments", dialog_args); for (std::vector<WebUIMessageHandler*>::iterator it = handlers.begin(); it != handlers.end(); ++it) { (*it)->Attach(this); diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 5632901..1498c73 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -250,7 +250,7 @@ void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) { command_line_string = CommandLine::ForCurrentProcess()->command_line_string(); #endif - render_view_host->SetDOMUIProperty("commandLineString", command_line_string); + render_view_host->SetWebUIProperty("commandLineString", command_line_string); WebUI::RenderViewCreated(render_view_host); } diff --git a/chrome/browser/dom_ui/web_ui.h b/chrome/browser/dom_ui/web_ui.h index d784def..aa95eda 100644 --- a/chrome/browser/dom_ui/web_ui.h +++ b/chrome/browser/dom_ui/web_ui.h @@ -183,11 +183,6 @@ class WebUI { DISALLOW_COPY_AND_ASSIGN(WebUI); }; -// TODO(tfarina): Remove this when all the references to DOMUI class are fixed. -// This is temporary until we can rename all the entries to WebUI. -// See crbug.com/59945 for more information. -typedef WebUI DOMUI; - // Messages sent from the DOM are forwarded via the WebUI to handler // classes. These objects are owned by WebUI and destroyed when the // host is destroyed. diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index c43f035..228935fb 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -221,9 +221,9 @@ void BalloonHost::Init() { initialized_ = true; } -void BalloonHost::EnableDOMUI() { +void BalloonHost::EnableWebUI() { DCHECK(render_view_host_ == NULL) << - "EnableDOMUI has to be called before a renderer is created."; + "EnableWebUI has to be called before a renderer is created."; enable_dom_ui_ = true; } diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h index 04ee9e4..1481680 100644 --- a/chrome/browser/notifications/balloon_host.h +++ b/chrome/browser/notifications/balloon_host.h @@ -113,7 +113,7 @@ class BalloonHost : public RenderViewHostDelegate, virtual RendererPreferences GetRendererPrefs(Profile* profile) const; // Enable Web UI. This has to be called before renderer is created. - void EnableDOMUI(); + void EnableWebUI(); virtual void UpdateInspectorSetting(const std::string& key, const std::string& value); diff --git a/chrome/browser/renderer_host/render_process_host.cc b/chrome/browser/renderer_host/render_process_host.cc index aca5ddb..e319178 100644 --- a/chrome/browser/renderer_host/render_process_host.cc +++ b/chrome/browser/renderer_host/render_process_host.cc @@ -66,7 +66,7 @@ static bool IsSuitableHost(RenderProcessHost* host, Profile* profile, RenderProcessHost::Type host_type = RenderProcessHost::TYPE_NORMAL; if (ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(host->id())) - host_type = RenderProcessHost::TYPE_DOMUI; + host_type = RenderProcessHost::TYPE_WEBUI; if (ChildProcessSecurityPolicy::GetInstance()-> HasExtensionBindings(host->id())) host_type = RenderProcessHost::TYPE_EXTENSION; diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h index 355e6bc..fa58495 100644 --- a/chrome/browser/renderer_host/render_process_host.h +++ b/chrome/browser/renderer_host/render_process_host.h @@ -43,7 +43,7 @@ class RenderProcessHost : public IPC::Channel::Sender, // in which case we call it an "extension" renderer. enum Type { TYPE_NORMAL, // Normal renderer, no extra privileges. - TYPE_DOMUI, // Renderer with WebUI privileges, like New Tab. + TYPE_WEBUI, // Renderer with WebUI privileges, like New Tab. TYPE_EXTENSION, // Renderer with extension privileges. }; diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index f460b41..756beee 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -631,10 +631,10 @@ void RenderViewHost::AllowBindings(int bindings_flags) { enabled_bindings_ |= bindings_flags; } -void RenderViewHost::SetDOMUIProperty(const std::string& name, +void RenderViewHost::SetWebUIProperty(const std::string& name, const std::string& value) { DCHECK(BindingsPolicy::is_dom_ui_enabled(enabled_bindings_)); - Send(new ViewMsg_SetDOMUIProperty(routing_id(), name, value)); + Send(new ViewMsg_SetWebUIProperty(routing_id(), name, value)); } void RenderViewHost::GotFocus() { @@ -764,7 +764,7 @@ bool RenderViewHost::OnMessageReceived(const IPC::Message& msg) { OnMsgDidContentsPreferredSizeChange) IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse, OnMsgDomOperationResponse) - IPC_MESSAGE_HANDLER(ViewHostMsg_DOMUISend, OnMsgDOMUISend) + IPC_MESSAGE_HANDLER(ViewHostMsg_WebUISend, OnMsgWebUISend) IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardMessageToExternalHost, OnMsgForwardMessageToExternalHost) IPC_MESSAGE_HANDLER(ViewHostMsg_SetTooltipText, OnMsgSetTooltipText) @@ -1131,7 +1131,7 @@ void RenderViewHost::OnMsgDomOperationResponse( Details<DomOperationNotificationDetails>(&details)); } -void RenderViewHost::OnMsgDOMUISend( +void RenderViewHost::OnMsgWebUISend( const GURL& source_url, const std::string& message, const std::string& content) { if (!ChildProcessSecurityPolicy::GetInstance()-> @@ -1146,7 +1146,7 @@ void RenderViewHost::OnMsgDOMUISend( if (!value.get() || !value->IsType(Value::TYPE_LIST)) { // The page sent us something that we didn't understand. // This probably indicates a programming error. - NOTREACHED() << "Invalid JSON argument in OnMsgDOMUISend."; + NOTREACHED() << "Invalid JSON argument in OnMsgWebUISend."; return; } } diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 1b4f37b..88ff1df 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -363,7 +363,7 @@ class RenderViewHost : public RenderWidgetHost { // Sets a property with the given name and value on the Web UI binding object. // Must call AllowWebUIBindings() on this renderer first. - void SetDOMUIProperty(const std::string& name, const std::string& value); + void SetWebUIProperty(const std::string& name, const std::string& value); // Tells the renderer view to focus the first (last if reverse is true) node. void SetInitialFocus(bool reverse); @@ -579,7 +579,7 @@ class RenderViewHost : public RenderWidgetHost { void OnMsgDidContentsPreferredSizeChange(const gfx::Size& new_size); void OnMsgDomOperationResponse(const std::string& json_string, int automation_id); - void OnMsgDOMUISend(const GURL& source_url, + void OnMsgWebUISend(const GURL& source_url, const std::string& message, const std::string& content); void OnMsgForwardMessageToExternalHost(const std::string& message, diff --git a/chrome/browser/renderer_host/site_instance.cc b/chrome/browser/renderer_host/site_instance.cc index 11d4f53..76d33fb 100644 --- a/chrome/browser/renderer_host/site_instance.cc +++ b/chrome/browser/renderer_host/site_instance.cc @@ -212,7 +212,7 @@ RenderProcessHost::Type SiteInstance::RendererTypeForURL(const GURL& url) { // TODO(erikkay) creis recommends using UseWebUIForURL instead. if (WebUIFactory::HasWebUIScheme(url)) - return RenderProcessHost::TYPE_DOMUI; + return RenderProcessHost::TYPE_WEBUI; return RenderProcessHost::TYPE_NORMAL; } diff --git a/chrome/browser/renderer_host/test/render_process_host_browsertest.cc b/chrome/browser/renderer_host/test/render_process_host_browsertest.cc index c6e68e7..aa75b51 100644 --- a/chrome/browser/renderer_host/test/render_process_host_browsertest.cc +++ b/chrome/browser/renderer_host/test/render_process_host_browsertest.cc @@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) { int tab_count = 1; int host_count = 1; - // Change the first tab to be the new tab page (TYPE_DOMUI). + // Change the first tab to be the new tab page (TYPE_WEBUI). GURL newtab(chrome::kChromeUINewTabURL); ui_test_utils::NavigateToURL(browser(), newtab); EXPECT_EQ(tab_count, browser()->tab_count()); @@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DISABLED_ProcessOverflow) { RenderProcessHost* rph2 = NULL; RenderProcessHost* rph3 = NULL; - // Change the first tab to be the new tab page (TYPE_DOMUI). + // Change the first tab to be the new tab page (TYPE_WEBUI). GURL newtab(chrome::kChromeUINewTabURL); ui_test_utils::NavigateToURL(browser(), newtab); EXPECT_EQ(tab_count, browser()->tab_count()); @@ -232,7 +232,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DISABLED_ProcessOverflow) { EXPECT_EQ(host_count, RenderProcessHostCount()); EXPECT_EQ(tab2->GetRenderProcessHost(), rph2); - // Create another TYPE_DOMUI tab. It should share the process with newtab. + // Create another TYPE_WEBUI tab. It should share the process with newtab. // Note: intentionally create this tab after the TYPE_NORMAL tabs to exercise // bug 43448 where extension and WebUI tabs could get combined into normal // renderers. diff --git a/chrome/browser/resources/menu.js b/chrome/browser/resources/menu.js index 8328db5..eb82918 100644 --- a/chrome/browser/resources/menu.js +++ b/chrome/browser/resources/menu.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,7 +16,7 @@ var MNEMONIC_REGEXP = /([^&]*)&(.)(.*)/; var localStrings = new LocalStrings(); /** - * Sends 'activate' DOMUI message. + * Sends 'activate' WebUI message. * @param {number} index The index of menu item to activate in menu model. * @param {string} mode The activation mode, one of 'close_and_activate', or * 'activate_no_close'. @@ -105,7 +105,7 @@ MenuItem.prototype = { }, /** - * Sends open_submenu DOMUI message. + * Sends open_submenu WebUI message. */ sendOpenSubmenuCommand: function() { chrome.send('open_submenu', diff --git a/chrome/browser/resources/network_menu.js b/chrome/browser/resources/network_menu.js index 19f40a6..d1396dd 100644 --- a/chrome/browser/resources/network_menu.js +++ b/chrome/browser/resources/network_menu.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,7 +29,7 @@ const NetworkOther = 'other'; })(); /** - * Sends "connect" using the 'action' DOMUI message. + * Sends "connect" using the 'action' WebUI message. */ function sendConnect(index, passphrase, identity, auto_connect) { chrome.send('action', diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index f722536..e132bd4 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -430,7 +430,7 @@ list:not([disabled]) > :hover { background-color: #e4ecf7; } -/* TODO(stuartmorgan): Once this becomes the list style for other DOMUI pages +/* TODO(stuartmorgan): Once this becomes the list style for other WebUI pages * these rules can be simplified (since they wont need to override other rules). */ diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc index 06120ab..7aaf5f3 100644 --- a/chrome/browser/tab_contents/render_view_host_manager.cc +++ b/chrome/browser/tab_contents/render_view_host_manager.cc @@ -199,7 +199,7 @@ void RenderViewHostManager::DidNavigateMainFrame( } } -void RenderViewHostManager::SetDOMUIPostCommit(WebUI* web_ui) { +void RenderViewHostManager::SetWebUIPostCommit(WebUI* web_ui) { DCHECK(!web_ui_.get()); web_ui_.reset(web_ui); } @@ -579,7 +579,7 @@ RenderViewHost* RenderViewHostManager::UpdateRendererStateForNavigate( // It must also happen after the above conditional call to CancelPending(), // otherwise CancelPending may clear the pending_web_ui_ and the page will // not have it's bindings set appropriately. - pending_web_ui_.reset(delegate_->CreateDOMUIForRenderManager(entry.url())); + pending_web_ui_.reset(delegate_->CreateWebUIForRenderManager(entry.url())); // render_view_host_ will not be deleted before the end of this method, so we // don't have to worry about this SiteInstance's ref count dropping to zero. diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h index ebf63d5..23fb866 100644 --- a/chrome/browser/tab_contents/render_view_host_manager.h +++ b/chrome/browser/tab_contents/render_view_host_manager.h @@ -54,7 +54,7 @@ class RenderViewHostManager // Creates a WebUI object for the given URL if one applies. Ownership of the // returned pointer will be passed to the caller. If no WebUI applies, // returns NULL. - virtual WebUI* CreateDOMUIForRenderManager(const GURL& url) = 0; + virtual WebUI* CreateWebUIForRenderManager(const GURL& url) = 0; // Returns the navigation entry of the current navigation, or NULL if there // is none. @@ -139,7 +139,7 @@ class RenderViewHostManager // Set the WebUI after committing a page load. This is useful for navigations // initiated from a renderer, where we want to give the new renderer WebUI // privileges from the originating renderer. - void SetDOMUIPostCommit(WebUI* web_ui); + void SetWebUIPostCommit(WebUI* web_ui); // Called when a provisional load on the given renderer is aborted. void RendererAbortedProvisionalLoad(RenderViewHost* render_view_host); diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 46f87e1..cbfe33f 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -667,7 +667,7 @@ bool TabContents::ShouldDisplayURL() { return true; } - WebUI* web_ui = GetDOMUIForCurrentState(); + WebUI* web_ui = GetWebUIForCurrentState(); if (web_ui) return !web_ui->should_hide_url(); return true; @@ -703,7 +703,7 @@ bool TabContents::ShouldDisplayFavIcon() { if (controller_.GetLastCommittedEntry() && controller_.pending_entry()) return true; - WebUI* web_ui = GetDOMUIForCurrentState(); + WebUI* web_ui = GetWebUIForCurrentState(); if (web_ui) return !web_ui->hide_favicon(); return true; @@ -1093,7 +1093,7 @@ void TabContents::FocusThroughTabTraversal(bool reverse) { } bool TabContents::FocusLocationBarByDefault() { - WebUI* web_ui = GetDOMUIForCurrentState(); + WebUI* web_ui = GetWebUIForCurrentState(); if (web_ui) return web_ui->focus_location_bar_by_default(); NavigationEntry* entry = controller_.GetActiveEntry(); @@ -1198,7 +1198,7 @@ bool TabContents::ShouldShowBookmarkBar() { if (!browser_defaults::bookmarks_enabled) return false; - // See GetDOMUIForCurrentState() comment for more info. This case is very + // See GetWebUIForCurrentState() comment for more info. This case is very // similar, but for non-first loads, we want to use the committed entry. This // is so the bookmarks bar disappears at the same time the page does. if (controller_.GetLastCommittedEntry()) { @@ -1208,7 +1208,7 @@ bool TabContents::ShouldShowBookmarkBar() { } // When it's the first load, we know either the pending one or the committed - // one will have the Web UI in it (see GetDOMUIForCurrentState), and only one + // one will have the Web UI in it (see GetWebUIForCurrentState), and only one // of them will be valid, so we can just check both. if (render_manager_.pending_web_ui()) return render_manager_.pending_web_ui()->force_bookmark_bar_visible(); @@ -1733,7 +1733,7 @@ void TabContents::ExpireInfoBars( } } -WebUI* TabContents::GetDOMUIForCurrentState() { +WebUI* TabContents::GetWebUIForCurrentState() { // When there is a pending navigation entry, we want to use the pending WebUI // that goes along with it to control the basic flags. For example, we want to // show the pending URL in the URL bar, so we want the display_url flag to @@ -1785,7 +1785,7 @@ void TabContents::DidNavigateMainFramePostCommit( WebUI* web_ui = WebUIFactory::CreateWebUIForURL(this, GetURL()); // web_ui might be NULL if the URL refers to a non-existent extension. if (web_ui) { - render_manager_.SetDOMUIPostCommit(web_ui); + render_manager_.SetWebUIPostCommit(web_ui); web_ui->RenderViewCreated(render_view_host()); } } @@ -2949,7 +2949,7 @@ NavigationController& TabContents::GetControllerForRenderManager() { return controller(); } -WebUI* TabContents::CreateDOMUIForRenderManager(const GURL& url) { +WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) { return WebUIFactory::CreateWebUIForURL(this, url); } diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 3812b62..05382bfb 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -814,7 +814,7 @@ class TabContents : public PageNavigator, // Returns the WebUI for the current state of the tab. This will either be // the pending WebUI, the committed WebUI, or NULL. - WebUI* GetDOMUIForCurrentState(); + WebUI* GetWebUIForCurrentState(); // Navigation helpers -------------------------------------------------------- // @@ -991,7 +991,7 @@ class TabContents : public PageNavigator, virtual void UpdateRenderViewSizeForRenderManager(); virtual void NotifySwappedFromRenderManager(); virtual NavigationController& GetControllerForRenderManager(); - virtual WebUI* CreateDOMUIForRenderManager(const GURL& url); + virtual WebUI* CreateWebUIForRenderManager(const GURL& url); virtual NavigationEntry* GetLastCommittedNavigationEntryForRenderManager(); // Initializes the given renderer if necessary and creates the view ID diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 454efff..9e1e464 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4351,7 +4351,7 @@ ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'], ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'], ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'], - # TODO(anicolao): exclude these once we have DOMUI dialogs + # TODO(anicolao): exclude these once we have WebUI dialogs # ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'], # ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'], ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 182e9c9..f502189 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1318,7 +1318,7 @@ const char kCompressSystemFeedback[] = "compress-sys-feedback"; const char kForceStubLibcros[] = "force-stub-libcros"; // Enables WebUI menu. -const char kEnableDOMUIMenu[] = "enable-domui-menu"; +const char kEnableWebUIMenu[] = "enable-domui-menu"; // Enables Media Player. const char kEnableMediaPlayer[] = "enable-media-player"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index d18661f..1edb5a8 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -370,7 +370,7 @@ extern const char kGuestSession[]; extern const char kStubCros[]; extern const char kScreenSaverUrl[]; extern const char kCompressSystemFeedback[]; -extern const char kEnableDOMUIMenu[]; +extern const char kEnableWebUIMenu[]; extern const char kEnableMediaPlayer[]; extern const char kEnableAdvancedFileSystem[]; #endif diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 57e405a..b20dc5f 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -498,7 +498,7 @@ IPC_MESSAGE_ROUTED1(ViewMsg_AllowBindings, // Tell the renderer to add a property to the WebUI binding object. This // only works if we allowed WebUI bindings. -IPC_MESSAGE_ROUTED2(ViewMsg_SetDOMUIProperty, +IPC_MESSAGE_ROUTED2(ViewMsg_SetWebUIProperty, std::string /* property_name */, std::string /* property_value_json */) @@ -1507,7 +1507,7 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_DomOperationResponse, // A message from HTML-based UI. When (trusted) Javascript calls // send(message, args), this message is sent to the browser. -IPC_MESSAGE_ROUTED3(ViewHostMsg_DOMUISend, +IPC_MESSAGE_ROUTED3(ViewHostMsg_WebUISend, GURL /* source_url */, std::string /* message */, std::string /* args (as a JSON string) */) diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 7ac9c84..95b8302 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1017,7 +1017,7 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDragLeave, OnDragTargetDragLeave) IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDrop, OnDragTargetDrop) IPC_MESSAGE_HANDLER(ViewMsg_AllowBindings, OnAllowBindings) - IPC_MESSAGE_HANDLER(ViewMsg_SetDOMUIProperty, OnSetDOMUIProperty) + IPC_MESSAGE_HANDLER(ViewMsg_SetWebUIProperty, OnSetWebUIProperty) IPC_MESSAGE_HANDLER(ViewMsg_DragSourceEndedOrMoved, OnDragSourceEndedOrMoved) IPC_MESSAGE_HANDLER(ViewMsg_DragSourceSystemDragEnded, @@ -4624,7 +4624,7 @@ void RenderView::OnAllowBindings(int enabled_bindings_flags) { enabled_bindings_ |= enabled_bindings_flags; } -void RenderView::OnSetDOMUIProperty(const std::string& name, +void RenderView::OnSetWebUIProperty(const std::string& name, const std::string& value) { DCHECK(BindingsPolicy::is_dom_ui_enabled(enabled_bindings_)); GetWebUIBindings()->SetProperty(name, value); diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 56962c26..8cc4e79 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -908,7 +908,7 @@ class RenderView : public RenderWidget, void OnSetContentSettingsForLoadingURL( const GURL& url, const ContentSettings& content_settings); - void OnSetDOMUIProperty(const std::string& name, const std::string& value); + void OnSetWebUIProperty(const std::string& name, const std::string& value); void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands); void OnSetInitialFocus(bool reverse); void OnScrollFocusedEditableNodeIntoView(); diff --git a/chrome/renderer/web_ui_bindings.cc b/chrome/renderer/web_ui_bindings.cc index 69a2d98..c84a54d 100644 --- a/chrome/renderer/web_ui_bindings.cc +++ b/chrome/renderer/web_ui_bindings.cc @@ -87,7 +87,7 @@ void WebUIBindings::send(const CppArgumentList& args, CppVariant* result) { // Send the message up to the browser. sender()->Send( - new ViewHostMsg_DOMUISend(routing_id(), source_url, message, content)); + new ViewHostMsg_WebUISend(routing_id(), source_url, message, content)); } void DOMBoundBrowserObject::SetProperty(const std::string& name, diff --git a/chrome/renderer/web_ui_bindings.h b/chrome/renderer/web_ui_bindings.h index 8f5841c..10965ff 100644 --- a/chrome/renderer/web_ui_bindings.h +++ b/chrome/renderer/web_ui_bindings.h @@ -52,7 +52,7 @@ class DOMBoundBrowserObject : public CppBoundClass { // // We expose one function, for sending a message to the browser: // send(String name, Object argument); -// It's plumbed through to the OnDOMUIMessage callback on RenderViewHost +// It's plumbed through to the OnWebUIMessage callback on RenderViewHost // delegate. class WebUIBindings : public DOMBoundBrowserObject { public: |