Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4797)

Unified Diff: chrome/browser/chromeos/views/native_menu_domui.h

Issue 6250123: WebUI: Change DOMUI to WebUI in two chromeos classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: avi review Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/views/menu_locator.cc ('k') | chrome/browser/chromeos/views/native_menu_domui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/views/native_menu_domui.h
diff --git a/chrome/browser/chromeos/views/native_menu_domui.h b/chrome/browser/chromeos/views/native_menu_domui.h
index 7b79d80376b90c4faf5985c48a8249b67d61997c..7222b496646aa20dcce87158458ce599734b778b 100644
--- a/chrome/browser/chromeos/views/native_menu_domui.h
+++ b/chrome/browser/chromeos/views/native_menu_domui.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.
@@ -11,7 +11,7 @@
#include "base/message_loop.h"
#include "base/observer_list.h"
#include "base/scoped_ptr.h"
-#include "chrome/browser/chromeos/dom_ui/domui_menu_control.h"
+#include "chrome/browser/chromeos/webui_menu_control.h"
#include "googleurl/src/gurl.h"
#include "views/controls/menu/menu_wrapper.h"
@@ -34,11 +34,11 @@ typedef union _XEvent XEvent;
namespace chromeos {
class MenuLocator;
-class DOMUIMenuWidget;
+class WebUIMenuWidget;
// A DOMUI implementation of MenuWrapper.
class NativeMenuDOMUI : public views::MenuWrapper,
- public DOMUIMenuControl,
+ public WebUIMenuControl,
public MessageLoop::Dispatcher {
public:
NativeMenuDOMUI(ui::MenuModel* menu_model, bool root);
@@ -50,7 +50,7 @@ class NativeMenuDOMUI : public views::MenuWrapper,
// Set parent menu.
void set_parent(NativeMenuDOMUI* parent) { parent_ = parent; }
- // Overridden from MenuWrapper:
+ // Overridden from views::MenuWrapper:
virtual void RunMenuAt(const gfx::Point& point, int alignment);
virtual void CancelMenu();
virtual void Rebuild();
@@ -61,14 +61,14 @@ class NativeMenuDOMUI : public views::MenuWrapper,
virtual void RemoveMenuListener(views::MenuListener* listener);
virtual void SetMinimumWidth(int width);
- // Overriden from MessageLoopForUI::Dispatcher:
+ // Overridden from MessageLoopForUI::Dispatcher:
virtual bool Dispatch(GdkEvent* event);
#if defined(TOUCH_UI)
virtual base::MessagePumpGlibXDispatcher::DispatchStatus Dispatch(
XEvent* xevent);
#endif
- // Overriden from DOMUIMenuControl;
+ // Overridden from WebUIMenuControl:
virtual ui::MenuModel* GetMenuModel() { return model_; }
virtual void Activate(ui::MenuModel* model,
int index,
@@ -123,7 +123,7 @@ class NativeMenuDOMUI : public views::MenuWrapper,
ui::MenuModel* model_;
// A window widget that draws the content of the menu.
- DOMUIMenuWidget* menu_widget_;
+ WebUIMenuWidget* menu_widget_;
// True if the menu is currently shown.
// Used only in root.
« no previous file with comments | « chrome/browser/chromeos/views/menu_locator.cc ('k') | chrome/browser/chromeos/views/native_menu_domui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698