WebUI: Change DOMUI to WebUI in two chromeos classes.

chrome/browser/chromeos/dom_ui/menu_ui.cc

 // 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.
 
 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/chromeos/views/domui_menu_widget.h"
 #include "chrome/browser/chromeos/views/native_menu_domui.h"
+#include "chrome/browser/chromeos/views/webui_menu_widget.h"
 #include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
 #include "grit/app_resources.h"
@@ skipping 364 matching lines @@
   std::string index_str;
   bool success = values->GetString(0, &index_str);
   DCHECK(success);
   std::string activation;
   success = values->GetString(1, &activation);
   DCHECK(success);
 
   int index;
   success = base::StringToInt(index_str, &index);
   DCHECK(success);
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control) {
     ui::MenuModel* model = GetMenuModel();
     DCHECK(model);
     DCHECK_GE(index, 0);
     DCHECK(activation == "close_and_activate" ||
            activation == "activate_no_close") << activation;
     if (model->IsEnabledAt(index)) {
       control->Activate(model,
                         index,
                         activation == "close_and_activate" ?
-                        chromeos::DOMUIMenuControl::CLOSE_AND_ACTIVATE :
-                        chromeos::DOMUIMenuControl::ACTIVATE_NO_CLOSE);
+                        chromeos::WebUIMenuControl::CLOSE_AND_ACTIVATE :
+                        chromeos::WebUIMenuControl::ACTIVATE_NO_CLOSE);
     }
   }
 }
 
 void MenuHandler::HandleOpenSubmenu(const ListValue* values) {
   CHECK_EQ(2U, values->GetSize());
   std::string index_str;
   bool success = values->GetString(0, &index_str);
   DCHECK(success);
   std::string y_str;
   success = values->GetString(1, &y_str);
   DCHECK(success);
   int index;
   success = base::StringToInt(index_str, &index);
   DCHECK(success);
   int y;
   success = base::StringToInt(y_str, &y);
   DCHECK(success);
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->OpenSubmenu(index, y);
 }
 
 void MenuHandler::HandleCloseSubmenu(const ListValue* values) {
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->CloseSubmenu();
 }
 
 void MenuHandler::HandleMoveInputToSubmenu(const ListValue* values) {
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->MoveInputToSubmenu();
 }
 
 void MenuHandler::HandleMoveInputToParent(const ListValue* values) {
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->MoveInputToParent();
 }
 
 void MenuHandler::HandleCloseAll(const ListValue* values) {
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->CloseAll();
 }
 
 void MenuHandler::HandleModelUpdated(const ListValue* values) {
   ui::MenuModel* model = GetMenuModel();
   if (model)
     static_cast<chromeos::MenuUI*>(dom_ui_)->ModelUpdated(model);
 }
 
 void MenuHandler::HandleLog(const ListValue* values) {
   CHECK_EQ(1U, values->GetSize());
   std::string msg;
   bool success = values->GetString(0, &msg);
   DCHECK(success);
   DVLOG(1) << msg;
 }
 
 void MenuHandler::UpdatePreferredSize(const gfx::Size& new_size) {
   if (!loaded_)
     return;
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control)
     control->SetSize(new_size);
 }
 
 void MenuHandler::LoadingStateChanged(TabContents* contents) {
-  chromeos::DOMUIMenuControl* control = GetMenuControl();
+  chromeos::WebUIMenuControl* control = GetMenuControl();
   if (control && !contents->is_loading()) {
     loaded_ = true;
     control->OnLoad();
     HandleModelUpdated(NULL);
   }
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuHandlerBase
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-chromeos::DOMUIMenuControl* MenuHandlerBase::GetMenuControl() {
-  DOMUIMenuWidget* widget =
-      chromeos::DOMUIMenuWidget::FindDOMUIMenuWidget(
+chromeos::WebUIMenuControl* MenuHandlerBase::GetMenuControl() {
+  WebUIMenuWidget* widget =
+      chromeos::WebUIMenuWidget::FindWebUIMenuWidget(
           dom_ui_->tab_contents()->GetNativeView());
   if (widget)
-    return widget->domui_menu();  // NativeMenuDOMUI implements DOMUIMenuControl
+    return widget->domui_menu();  // NativeMenuDOMUI implements WebUIMenuControl
   else
     return NULL;
 }
 
 ui::MenuModel* MenuHandlerBase::GetMenuModel() {
-  DOMUIMenuControl* control = GetMenuControl();
+  WebUIMenuControl* control = GetMenuControl();
   if (control)
     return control->GetMenuModel();
   else
     return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuUI
 //
@@ skipping 57 matching lines @@
         item = CreateMenuItem(model, index, "check",
                               &max_icon_width, &has_accelerator);
         break;
       default:
         // TODO(oshima): We don't support BUTTOM_ITEM for now.
         NOTREACHED();
         continue;
     }
     items->Set(index, item);
   }
-  DOMUIMenuWidget* widget =
-      chromeos::DOMUIMenuWidget::FindDOMUIMenuWidget(
+  WebUIMenuWidget* widget =
+      chromeos::WebUIMenuWidget::FindWebUIMenuWidget(
           tab_contents()->GetNativeView());
   DCHECK(widget);
   json_model.SetInteger("maxIconWidth", max_icon_width);
   json_model.SetBoolean("isRoot", widget->is_root());
   json_model.SetBoolean("hasAccelerator", has_accelerator);
   CallJavascriptFunction(L"updateModel", json_model);
 }
 
 DictionaryValue* MenuUI::CreateMenuItem(const ui::MenuModel* model,
                                         int index,
@@ skipping 47 matching lines @@
 
 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {
   return CreateMenuUIHTMLSource(NULL,
                                 chrome::kChromeUIMenu,
                                 "Menu" /* class name */,
                                 kNoExtraResource,
                                 kNoExtraResource);
 }
 
 }  // namespace chromeos