diff options
Diffstat (limited to 'chrome/browser/ui')
94 files changed, 511 insertions, 495 deletions
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h index 9b0a555..c4c5521 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.h +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h @@ -8,7 +8,7 @@ #include <map> -#include "app/menus/accelerator_cocoa.h" +#include "ui/base/models/accelerator_cocoa.h" template <typename T> struct DefaultSingletonTraits; @@ -26,10 +26,10 @@ template <typename T> struct DefaultSingletonTraits; // class AcceleratorsCocoa { public: - typedef std::map<int, menus::AcceleratorCocoa> AcceleratorCocoaMap; + typedef std::map<int, ui::AcceleratorCocoa> AcceleratorCocoaMap; // Returns NULL if there is no accelerator for the command. - const menus::AcceleratorCocoa* GetAcceleratorForCommand(int command_id); + const ui::AcceleratorCocoa* GetAcceleratorForCommand(int command_id); // Returns the singleton instance. static AcceleratorsCocoa* GetInstance(); diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm index 6f28a0f..f62bd50 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm @@ -44,7 +44,7 @@ const struct AcceleratorMapping { AcceleratorsCocoa::AcceleratorsCocoa() { for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { const AcceleratorMapping& entry = kAcceleratorMap[i]; - menus::AcceleratorCocoa accelerator(entry.key, entry.modifiers); + ui::AcceleratorCocoa accelerator(entry.key, entry.modifiers); accelerators_.insert(std::make_pair(entry.command_id, accelerator)); } } @@ -54,7 +54,7 @@ AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() { return Singleton<AcceleratorsCocoa>::get(); } -const menus::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( +const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( int command_id) { AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); if (it == accelerators_.end()) diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm index ef1436d..2a39ffe 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm @@ -4,16 +4,16 @@ #import <Cocoa/Cocoa.h> -#include "app/menus/accelerator_cocoa.h" #include "base/singleton.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" +#include "ui/base/models/accelerator_cocoa.h" TEST(AcceleratorsCocoaTest, GetAccelerator) { AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); - const menus::AcceleratorCocoa* accelerator = + const ui::AcceleratorCocoa* accelerator = keymap->GetAcceleratorForCommand(IDC_COPY); ASSERT_TRUE(accelerator); EXPECT_NSEQ(@"c", accelerator->characters()); @@ -22,7 +22,7 @@ TEST(AcceleratorsCocoaTest, GetAccelerator) { TEST(AcceleratorsCocoaTest, GetNullAccelerator) { AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); - const menus::AcceleratorCocoa* accelerator = + const ui::AcceleratorCocoa* accelerator = keymap->GetAcceleratorForCommand(314159265); EXPECT_FALSE(accelerator); } diff --git a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm index c85ceab..1adf875 100644 --- a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" -#include "app/table_model_observer.h" #include "base/command_line.h" #import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" @@ -17,6 +16,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/models/table_model_observer.h" @interface ContentExceptionsWindowController (Private) - (id)initWithType:(ContentSettingsType)settingsType diff --git a/chrome/browser/ui/cocoa/cookie_tree_node.h b/chrome/browser/ui/cocoa/cookie_tree_node.h index ec1b2d2..400244c 100644 --- a/chrome/browser/ui/cocoa/cookie_tree_node.h +++ b/chrome/browser/ui/cocoa/cookie_tree_node.h @@ -24,7 +24,7 @@ // Common getters.. - (NSString*)title; - (CocoaCookieDetailsType)nodeType; -- (TreeModelNode*)treeNode; +- (ui::TreeModelNode*)treeNode; // |-mutableChildren| exists so that the CookiesTreeModelObserverBridge can // operate on the children. Note that this lazily creates children. diff --git a/chrome/browser/ui/cocoa/cookie_tree_node.mm b/chrome/browser/ui/cocoa/cookie_tree_node.mm index fa4da84..eeddadd 100644 --- a/chrome/browser/ui/cocoa/cookie_tree_node.mm +++ b/chrome/browser/ui/cocoa/cookie_tree_node.mm @@ -33,7 +33,7 @@ return [details_.get() type]; } -- (TreeModelNode*)treeNode { +- (ui::TreeModelNode*)treeNode { return treeNode_; } diff --git a/chrome/browser/ui/cocoa/cookies_window_controller.h b/chrome/browser/ui/cocoa/cookies_window_controller.h index 658bfa7..85d8b3e 100644 --- a/chrome/browser/ui/cocoa/cookies_window_controller.h +++ b/chrome/browser/ui/cocoa/cookies_window_controller.h @@ -14,13 +14,16 @@ @class CookiesWindowController; @class CookieDetailsViewController; class Profile; -class TreeModel; -class TreeModelNode; namespace { class CookiesWindowControllerTest; } +namespace ui { +class TreeModel; +class TreeModelNode; +} + // Thin bridge to the window controller that performs model update actions // directly on the treeController_. class CookiesTreeModelObserverBridge : public CookiesTreeModel::Observer { @@ -28,15 +31,15 @@ class CookiesTreeModelObserverBridge : public CookiesTreeModel::Observer { explicit CookiesTreeModelObserverBridge(CookiesWindowController* controller); // Begin TreeModelObserver implementation. - virtual void TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count); - virtual void TreeNodesRemoved(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesRemoved(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count); - virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node); + virtual void TreeNodeChanged(ui::TreeModel* model, ui::TreeModelNode* node); // End TreeModelObserver implementation. virtual void TreeModelBeginBatch(CookiesTreeModel* model); @@ -51,12 +54,12 @@ class CookiesTreeModelObserverBridge : public CookiesTreeModel::Observer { // Creates a CocoaCookieTreeNode from a platform-independent one. // Return value is autoreleased. This creates child nodes recusively. - CocoaCookieTreeNode* CocoaNodeFromTreeNode(TreeModelNode* node); + CocoaCookieTreeNode* CocoaNodeFromTreeNode(ui::TreeModelNode* node); // Finds the Cocoa model node based on a platform-independent one. This is // done by comparing the treeNode pointers. |start| is the node to start // searching at. If |start| is nil, the root is used. - CocoaCookieTreeNode* FindCocoaNode(TreeModelNode* node, + CocoaCookieTreeNode* FindCocoaNode(ui::TreeModelNode* node, CocoaCookieTreeNode* start); // Returns whether or not the Cocoa tree model is built. diff --git a/chrome/browser/ui/cocoa/cookies_window_controller.mm b/chrome/browser/ui/cocoa/cookies_window_controller.mm index 5e5f74f..33cb858 100644 --- a/chrome/browser/ui/cocoa/cookies_window_controller.mm +++ b/chrome/browser/ui/cocoa/cookies_window_controller.mm @@ -31,8 +31,8 @@ CookiesTreeModelObserverBridge::CookiesTreeModelObserverBridge( } // Notification that nodes were added to the specified parent. -void CookiesTreeModelObserverBridge::TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, +void CookiesTreeModelObserverBridge::TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) { // We're in for a major rebuild. Ignore this request. @@ -53,8 +53,8 @@ void CookiesTreeModelObserverBridge::TreeNodesAdded(TreeModel* model, } // Notification that nodes were removed from the specified parent. -void CookiesTreeModelObserverBridge::TreeNodesRemoved(TreeModel* model, - TreeModelNode* parent, +void CookiesTreeModelObserverBridge::TreeNodesRemoved(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) { // We're in for a major rebuild. Ignore this request. @@ -71,8 +71,8 @@ void CookiesTreeModelObserverBridge::TreeNodesRemoved(TreeModel* model, } // Notification that the contents of a node has changed. -void CookiesTreeModelObserverBridge::TreeNodeChanged(TreeModel* model, - TreeModelNode* node) { +void CookiesTreeModelObserverBridge::TreeNodeChanged(ui::TreeModel* model, + ui::TreeModelNode* node) { // If we don't have a Cocoa model, only let the root node change. if (batch_update_ || (!HasCocoaModel() && model->GetRoot() != node)) return; @@ -107,7 +107,7 @@ void CookiesTreeModelObserverBridge::InvalidateCocoaModel() { } CocoaCookieTreeNode* CookiesTreeModelObserverBridge::CocoaNodeFromTreeNode( - TreeModelNode* node) { + ui::TreeModelNode* node) { CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node); return [[[CocoaCookieTreeNode alloc] initWithNode:cookie_node] autorelease]; } @@ -116,7 +116,7 @@ CocoaCookieTreeNode* CookiesTreeModelObserverBridge::CocoaNodeFromTreeNode( // commonly used to find origin/folder nodes, which are at the first level off // the root (hence breadth-first search). CocoaCookieTreeNode* CookiesTreeModelObserverBridge::FindCocoaNode( - TreeModelNode* target, CocoaCookieTreeNode* start) { + ui::TreeModelNode* target, CocoaCookieTreeNode* start) { if (!start) { start = [window_controller_ cocoaTreeModel]; } diff --git a/chrome/browser/ui/cocoa/cookies_window_controller_unittest.mm b/chrome/browser/ui/cocoa/cookies_window_controller_unittest.mm index 5272cd2..0cd8d1d8 100644 --- a/chrome/browser/ui/cocoa/cookies_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/cookies_window_controller_unittest.mm @@ -5,7 +5,6 @@ #import <Cocoa/Cocoa.h> #include "app/l10n_util_mac.h" -#include "app/tree_model.h" #import "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" @@ -28,23 +27,24 @@ #import "testing/gtest_mac.h" #include "testing/platform_test.h" #import "third_party/ocmock/OCMock/OCMock.h" +#include "ui/base/models/tree_model.h" // Used to test FindCocoaNode. This only sets the title and node, without // initializing any other members. @interface FakeCocoaCookieTreeNode : CocoaCookieTreeNode { - TreeModelNode* testNode_; + ui::TreeModelNode* testNode_; } -- (id)initWithTreeNode:(TreeModelNode*)node; +- (id)initWithTreeNode:(ui::TreeModelNode*)node; @end @implementation FakeCocoaCookieTreeNode -- (id)initWithTreeNode:(TreeModelNode*)node { +- (id)initWithTreeNode:(ui::TreeModelNode*)node { if ((self = [super init])) { testNode_ = node; children_.reset([[NSMutableArray alloc] init]); } return self; } -- (TreeModelNode*)treeNode { +- (ui::TreeModelNode*)treeNode { return testNode_; } @end @@ -73,11 +73,11 @@ class CookiesWindowControllerTest : public CocoaTest { CocoaTest::TearDown(); } - CocoaCookieTreeNode* CocoaNodeFromTreeNode(TreeModelNode* node) { + CocoaCookieTreeNode* CocoaNodeFromTreeNode(ui::TreeModelNode* node) { return [controller_ modelObserver]->CocoaNodeFromTreeNode(node); } - CocoaCookieTreeNode* FindCocoaNode(TreeModelNode* node, + CocoaCookieTreeNode* FindCocoaNode(ui::TreeModelNode* node, CocoaCookieTreeNode* start) { return [controller_ modelObserver]->FindCocoaNode(node, start); } @@ -98,16 +98,20 @@ TEST_F(CookiesWindowControllerTest, Construction) { } TEST_F(CookiesWindowControllerTest, FindCocoaNodeRoot) { - scoped_ptr< TreeNodeWithValue<int> > search(new TreeNodeWithValue<int>(42)); + scoped_ptr< ui::TreeNodeWithValue<int> > search( + new TreeNodeWithValue<int>(42)); scoped_nsobject<FakeCocoaCookieTreeNode> node( [[FakeCocoaCookieTreeNode alloc] initWithTreeNode:search.get()]); EXPECT_EQ(node.get(), FindCocoaNode(search.get(), node.get())); } TEST_F(CookiesWindowControllerTest, FindCocoaNodeImmediateChild) { - scoped_ptr< TreeNodeWithValue<int> > parent(new TreeNodeWithValue<int>(100)); - scoped_ptr< TreeNodeWithValue<int> > child1(new TreeNodeWithValue<int>(10)); - scoped_ptr< TreeNodeWithValue<int> > child2(new TreeNodeWithValue<int>(20)); + scoped_ptr< ui::TreeNodeWithValue<int> > parent( + new TreeNodeWithValue<int>(100)); + scoped_ptr< ui::TreeNodeWithValue<int> > child1( + new TreeNodeWithValue<int>(10)); + scoped_ptr< ui::TreeNodeWithValue<int> > child2( + new TreeNodeWithValue<int>(20)); scoped_nsobject<FakeCocoaCookieTreeNode> cocoaParent( [[FakeCocoaCookieTreeNode alloc] initWithTreeNode:parent.get()]); scoped_nsobject<FakeCocoaCookieTreeNode> cocoaChild1( @@ -121,9 +125,12 @@ TEST_F(CookiesWindowControllerTest, FindCocoaNodeImmediateChild) { } TEST_F(CookiesWindowControllerTest, FindCocoaNodeRecursive) { - scoped_ptr< TreeNodeWithValue<int> > parent(new TreeNodeWithValue<int>(100)); - scoped_ptr< TreeNodeWithValue<int> > child1(new TreeNodeWithValue<int>(10)); - scoped_ptr< TreeNodeWithValue<int> > child2(new TreeNodeWithValue<int>(20)); + scoped_ptr< ui::TreeNodeWithValue<int> > parent( + new TreeNodeWithValue<int>(100)); + scoped_ptr< ui::TreeNodeWithValue<int> > child1( + new TreeNodeWithValue<int>(10)); + scoped_ptr< ui::TreeNodeWithValue<int> > child2( + new TreeNodeWithValue<int>(20)); scoped_nsobject<FakeCocoaCookieTreeNode> cocoaParent( [[FakeCocoaCookieTreeNode alloc] initWithTreeNode:parent.get()]); scoped_nsobject<FakeCocoaCookieTreeNode> cocoaChild1( @@ -142,7 +149,8 @@ TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeCookie) { CookiesTreeModel model(cm, database_helper_, local_storage_helper_, nil, nil); // Root --> foo.com --> Cookies --> A. Create node for 'A'. - TreeModelNode* node = model.GetRoot()->GetChild(0)->GetChild(0)->GetChild(0); + ui::TreeModelNode* node = + model.GetRoot()->GetChild(0)->GetChild(0)->GetChild(0); CocoaCookieTreeNode* cookie = CocoaNodeFromTreeNode(node); CocoaCookieDetails* details = [cookie details]; diff --git a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h index 6acc829..252f557 100644 --- a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/table_model_observer.h" #import "base/mac/cocoa_protocols.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -12,6 +11,7 @@ #include "chrome/browser/search_engines/keyword_editor_controller.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h" +#include "ui/base/models/table_model_observer.h" class EditSearchEngineControllerDelegate; @class KeywordEditorCocoaController; @@ -21,7 +21,7 @@ class Profile; // Very thin bridge that simply pushes notifications from C++ to ObjC. class KeywordEditorModelObserver : public TemplateURLModelObserver, public EditSearchEngineControllerDelegate, - public TableModelObserver, + public ui::TableModelObserver, public TableRowNSImageCache::Table { public: explicit KeywordEditorModelObserver(KeywordEditorCocoaController* controller); @@ -40,7 +40,7 @@ class KeywordEditorModelObserver : public TemplateURLModelObserver, const string16& keyword, const std::string& url); - // TableModelObserver overrides. Invalidate icon cache. + // ui::TableModelObserver overrides. Invalidate icon cache. virtual void OnModelChanged(); virtual void OnItemsChanged(int start, int length); virtual void OnItemsAdded(int start, int length); diff --git a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm index 2ae0fa6..64ce03c 100644 --- a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm @@ -293,7 +293,7 @@ static base::LazyInstance<ProfileControllerMap> g_profile_controller_map( row:(NSInteger)row { if ([self tableView:tv isGroupRow:row]) { DCHECK(!tableColumn); - TableModel::Groups groups = controller_->table_model()->GetGroups(); + ui::TableModel::Groups groups = controller_->table_model()->GetGroups(); if (row == 0) { return base::SysUTF16ToNSString(groups[0].title); } else { diff --git a/chrome/browser/ui/cocoa/menu_controller.h b/chrome/browser/ui/cocoa/menu_controller.h index c198c70..4be9b0d 100644 --- a/chrome/browser/ui/cocoa/menu_controller.h +++ b/chrome/browser/ui/cocoa/menu_controller.h @@ -10,7 +10,7 @@ #include "base/scoped_nsobject.h" -namespace menus { +namespace ui { class MenuModel; } @@ -22,12 +22,12 @@ class MenuModel; // as it only maintains weak references. @interface MenuController : NSObject { @protected - menus::MenuModel* model_; // weak + ui::MenuModel* model_; // weak scoped_nsobject<NSMenu> menu_; BOOL useWithPopUpButtonCell_; // If YES, 0th item is blank } -@property (nonatomic, assign) menus::MenuModel* model; +@property (nonatomic, assign) ui::MenuModel* model; // Note that changing this will have no effect if you use // |-initWithModel:useWithPopUpButtonCell:| or after the first call to |-menu|. @property (nonatomic) BOOL useWithPopUpButtonCell; @@ -42,7 +42,7 @@ class MenuModel; // the menu will be displayed by a NSPopUpButtonCell, it needs to be of a // slightly different form (0th item is empty). Note this attribute of the menu // cannot be changed after it has been created. -- (id)initWithModel:(menus::MenuModel*)model +- (id)initWithModel:(ui::MenuModel*)model useWithPopUpButtonCell:(BOOL)useWithCell; // Access to the constructed menu if the complex initializer was used. If the @@ -60,7 +60,7 @@ class MenuModel; @interface MenuController (Protected) - (void)addItemToMenu:(NSMenu*)menu atIndex:(NSInteger)index - fromModel:(menus::MenuModel*)model + fromModel:(ui::MenuModel*)model modelIndex:(int)modelIndex; @end diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm index a6d314d..9a1d5a8 100644 --- a/chrome/browser/ui/cocoa/menu_controller.mm +++ b/chrome/browser/ui/cocoa/menu_controller.mm @@ -5,15 +5,15 @@ #import "chrome/browser/ui/cocoa/menu_controller.h" #include "app/l10n_util_mac.h" -#include "app/menus/accelerator_cocoa.h" -#include "app/menus/simple_menu_model.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/models/simple_menu_model.h" @interface MenuController (Private) -- (NSMenu*)menuFromModel:(menus::MenuModel*)model; +- (NSMenu*)menuFromModel:(ui::MenuModel*)model; - (void)addSeparatorToMenu:(NSMenu*)menu atIndex:(int)index; @end @@ -28,7 +28,7 @@ return self; } -- (id)initWithModel:(menus::MenuModel*)model +- (id)initWithModel:(ui::MenuModel*)model useWithPopUpButtonCell:(BOOL)useWithCell { if ((self = [super init])) { model_ = model; @@ -45,7 +45,7 @@ // Creates a NSMenu from the given model. If the model has submenus, this can // be invoked recursively. -- (NSMenu*)menuFromModel:(menus::MenuModel*)model { +- (NSMenu*)menuFromModel:(ui::MenuModel*)model { NSMenu* menu = [[[NSMenu alloc] initWithTitle:@""] autorelease]; // The indices may not always start at zero (the windows system menu is one @@ -56,7 +56,7 @@ const int count = model->GetItemCount(); for (int index = firstItemIndex; index < firstItemIndex + count; index++) { int modelIndex = index - firstItemIndex; - if (model->GetTypeAt(modelIndex) == menus::MenuModel::TYPE_SEPARATOR) { + if (model->GetTypeAt(modelIndex) == ui::MenuModel::TYPE_SEPARATOR) { [self addSeparatorToMenu:menu atIndex:index]; } else { [self addItemToMenu:menu atIndex:index fromModel:model @@ -80,7 +80,7 @@ // associated with the entry in the model indentifed by |modelIndex|. - (void)addItemToMenu:(NSMenu*)menu atIndex:(NSInteger)index - fromModel:(menus::MenuModel*)model + fromModel:(ui::MenuModel*)model modelIndex:(int)modelIndex { NSString* label = l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex)); @@ -98,14 +98,14 @@ } } - menus::MenuModel::ItemType type = model->GetTypeAt(modelIndex); - if (type == menus::MenuModel::TYPE_SUBMENU) { + ui::MenuModel::ItemType type = model->GetTypeAt(modelIndex); + if (type == ui::MenuModel::TYPE_SUBMENU) { // Recursively build a submenu from the sub-model at this index. [item setTarget:nil]; [item setAction:nil]; - menus::MenuModel* submenuModel = model->GetSubmenuModelAt(modelIndex); + ui::MenuModel* submenuModel = model->GetSubmenuModelAt(modelIndex); NSMenu* submenu = - [self menuFromModel:(menus::SimpleMenuModel*)submenuModel]; + [self menuFromModel:(ui::SimpleMenuModel*)submenuModel]; [item setSubmenu:submenu]; } else { // The MenuModel works on indexes so we can't just set the command id as the @@ -117,7 +117,7 @@ [item setTarget:self]; NSValue* modelObject = [NSValue valueWithPointer:model]; [item setRepresentedObject:modelObject]; // Retains |modelObject|. - menus::AcceleratorCocoa accelerator; + ui::AcceleratorCocoa accelerator; if (model->GetAcceleratorAt(modelIndex, &accelerator)) { [item setKeyEquivalent:accelerator.characters()]; [item setKeyEquivalentModifierMask:accelerator.modifiers()]; @@ -135,8 +135,8 @@ return NO; NSInteger modelIndex = [item tag]; - menus::MenuModel* model = - static_cast<menus::MenuModel*>( + ui::MenuModel* model = + static_cast<ui::MenuModel*>( [[(id)item representedObject] pointerValue]); DCHECK(model); if (model) { @@ -164,8 +164,8 @@ // item chosen. - (void)itemSelected:(id)sender { NSInteger modelIndex = [sender tag]; - menus::MenuModel* model = - static_cast<menus::MenuModel*>( + ui::MenuModel* model = + static_cast<ui::MenuModel*>( [[sender representedObject] pointerValue]); DCHECK(model); if (model) diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index 8e00c53..f3d40bb 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -13,13 +12,14 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/models/simple_menu_model.h" class MenuControllerTest : public CocoaTest { }; // A menu delegate that counts the number of times certain things are called // to make sure things are hooked up properly. -class Delegate : public menus::SimpleMenuModel::Delegate { +class Delegate : public ui::SimpleMenuModel::Delegate { public: Delegate() : execute_count_(0), enable_count_(0) { } @@ -30,7 +30,7 @@ class Delegate : public menus::SimpleMenuModel::Delegate { } virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { return false; } + ui::Accelerator* accelerator) { return false; } virtual void ExecuteCommand(int command_id) { ++execute_count_; } int execute_count_; @@ -62,7 +62,7 @@ class DynamicDelegate : public Delegate { TEST_F(MenuControllerTest, EmptyMenu) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); scoped_nsobject<MenuController> menu( [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]); EXPECT_EQ([[menu menu] numberOfItems], 0); @@ -70,7 +70,7 @@ TEST_F(MenuControllerTest, EmptyMenu) { TEST_F(MenuControllerTest, BasicCreation) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); model.AddItem(2, ASCIIToUTF16("two")); model.AddItem(3, ASCIIToUTF16("three")); @@ -95,9 +95,9 @@ TEST_F(MenuControllerTest, BasicCreation) { TEST_F(MenuControllerTest, Submenus) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); - menus::SimpleMenuModel submodel(&delegate); + ui::SimpleMenuModel submodel(&delegate); submodel.AddItem(2, ASCIIToUTF16("sub-one")); submodel.AddItem(3, ASCIIToUTF16("sub-two")); submodel.AddItem(4, ASCIIToUTF16("sub-three")); @@ -132,9 +132,9 @@ TEST_F(MenuControllerTest, Submenus) { TEST_F(MenuControllerTest, EmptySubmenu) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); - menus::SimpleMenuModel submodel(&delegate); + ui::SimpleMenuModel submodel(&delegate); model.AddSubMenuWithStringId(2, IDS_ZOOM_MENU, &submodel); scoped_nsobject<MenuController> menu( @@ -144,7 +144,7 @@ TEST_F(MenuControllerTest, EmptySubmenu) { TEST_F(MenuControllerTest, PopUpButton) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); model.AddItem(2, ASCIIToUTF16("two")); model.AddItem(3, ASCIIToUTF16("three")); @@ -164,7 +164,7 @@ TEST_F(MenuControllerTest, PopUpButton) { TEST_F(MenuControllerTest, Execute) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); scoped_nsobject<MenuController> menu( [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]); @@ -188,10 +188,10 @@ void Validate(MenuController* controller, NSMenu* menu) { TEST_F(MenuControllerTest, Validate) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); model.AddItem(2, ASCIIToUTF16("two")); - menus::SimpleMenuModel submodel(&delegate); + ui::SimpleMenuModel submodel(&delegate); submodel.AddItem(2, ASCIIToUTF16("sub-one")); model.AddSubMenuWithStringId(3, IDS_ZOOM_MENU, &submodel); @@ -204,7 +204,7 @@ TEST_F(MenuControllerTest, Validate) { TEST_F(MenuControllerTest, DefaultInitializer) { Delegate delegate; - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("one")); model.AddItem(2, ASCIIToUTF16("two")); model.AddItem(3, ASCIIToUTF16("three")); @@ -230,7 +230,7 @@ TEST_F(MenuControllerTest, Dynamic) { // no icon. string16 initial = ASCIIToUTF16("initial"); delegate.SetDynamicLabel(initial); - menus::SimpleMenuModel model(&delegate); + ui::SimpleMenuModel model(&delegate); model.AddItem(1, ASCIIToUTF16("foo")); scoped_nsobject<MenuController> menu( [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]); diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm index 7b4c1f8..213e449 100644 --- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm @@ -5,13 +5,13 @@ #import "chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h" #include "app/l10n_util_mac.h" -#include "app/table_model_observer.h" #include "base/logging.h" #import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/models/table_model_observer.h" @interface SimpleContentExceptionsWindowController (Private) - (id)initWithTableModel:(RemoveRowsTableModel*)model; diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h index c414ec90..7c2c84e 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h @@ -28,7 +28,7 @@ class StatusIconMac : public StatusIcon { protected: // Overridden from StatusIcon. - virtual void UpdatePlatformContextMenu(menus::MenuModel* menu); + virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); private: // Getter for item_ that allows lazy initialization. diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm index 3f3d5a1..9ac39bf 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm @@ -76,7 +76,7 @@ void StatusIconMac::SetToolTip(const string16& tool_tip) { [item() setToolTip:base::SysUTF16ToNSString(tool_tip)]; } -void StatusIconMac::UpdatePlatformContextMenu(menus::MenuModel* menu) { +void StatusIconMac::UpdatePlatformContextMenu(ui::MenuModel* menu) { // TODO(atwilson): Add support for context menus for Mac when actually needed // (not yet used by anything) - http://crbug.com/37375. } diff --git a/chrome/browser/ui/cocoa/tab_controller.mm b/chrome/browser/ui/cocoa/tab_controller.mm index f05bb21..fb8c6b1 100644 --- a/chrome/browser/ui/cocoa/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tab_controller.mm @@ -30,13 +30,13 @@ namespace TabControllerInternal { // A C++ delegate that handles enabling/disabling menu items and handling when // a menu command is chosen. Also fixes up the menu item label for "pin/unpin // tab". -class MenuDelegate : public menus::SimpleMenuModel::Delegate { +class MenuDelegate : public ui::SimpleMenuModel::Delegate { public: explicit MenuDelegate(id<TabControllerTarget> target, TabController* owner) : target_(target), owner_(owner) {} - // Overridden from menus::SimpleMenuModel::Delegate + // Overridden from ui::SimpleMenuModel::Delegate virtual bool IsCommandIdChecked(int command_id) const { return false; } virtual bool IsCommandIdEnabled(int command_id) const { TabStripModel::ContextMenuCommand command = @@ -45,7 +45,7 @@ class MenuDelegate : public menus::SimpleMenuModel::Delegate { } virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { return false; } + ui::Accelerator* accelerator) { return false; } virtual void ExecuteCommand(int command_id) { TabStripModel::ContextMenuCommand command = static_cast<TabStripModel::ContextMenuCommand>(command_id); diff --git a/chrome/browser/ui/cocoa/table_model_array_controller.h b/chrome/browser/ui/cocoa/table_model_array_controller.h index 63cf4c8..850bf6d 100644 --- a/chrome/browser/ui/cocoa/table_model_array_controller.h +++ b/chrome/browser/ui/cocoa/table_model_array_controller.h @@ -8,10 +8,10 @@ #import <Cocoa/Cocoa.h> -#include "app/table_model_observer.h" #import "base/mac/cocoa_protocols.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" +#include "ui/base/models/table_model_observer.h" class RemoveRowsObserverBridge; class RemoveRowsTableModel; diff --git a/chrome/browser/ui/cocoa/table_model_array_controller.mm b/chrome/browser/ui/cocoa/table_model_array_controller.mm index dcc2e6a..8678fa8 100644 --- a/chrome/browser/ui/cocoa/table_model_array_controller.mm +++ b/chrome/browser/ui/cocoa/table_model_array_controller.mm @@ -4,10 +4,10 @@ #import "chrome/browser/ui/cocoa/table_model_array_controller.h" -#include "app/table_model.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/remove_rows_table_model.h" +#include "ui/base/models/table_model.h" @interface TableModelArrayController () @@ -24,13 +24,13 @@ @end // Observer for a RemoveRowsTableModel. -class RemoveRowsObserverBridge : public TableModelObserver { +class RemoveRowsObserverBridge : public ui::TableModelObserver { public: RemoveRowsObserverBridge(TableModelArrayController* controller) : controller_(controller) {} virtual ~RemoveRowsObserverBridge() {} - // TableModelObserver methods + // ui::TableModelObserver methods virtual void OnModelChanged(); virtual void OnItemsChanged(int start, int length); virtual void OnItemsAdded(int start, int length); @@ -78,9 +78,9 @@ static NSString* const kGroupID = @"_group_id"; NSMakeRange(0, [[self arrangedObjects] count])]; [self removeObjectsAtArrangedObjectIndexes:indexes]; if (model_->HasGroups()) { - const TableModel::Groups& groups = model_->GetGroups(); + const ui::TableModel::Groups& groups = model_->GetGroups(); DCHECK(groupTitle_.get()); - for (TableModel::Groups::const_iterator it = groups.begin(); + for (ui::TableModel::Groups::const_iterator it = groups.begin(); it != groups.end(); ++it) { NSDictionary* group = [NSDictionary dictionaryWithObjectsAndKeys: base::SysUTF16ToNSString(it->title), groupTitle_.get(), @@ -93,7 +93,7 @@ static NSString* const kGroupID = @"_group_id"; } - (NSUInteger)offsetForGroupID:(int)groupID startingOffset:(NSUInteger)offset { - const TableModel::Groups& groups = model_->GetGroups(); + const ui::TableModel::Groups& groups = model_->GetGroups(); DCHECK_GT(offset, 0u); for (NSUInteger i = offset - 1; i < groups.size(); ++i) { if (groups[i].id == groupID) diff --git a/chrome/browser/ui/cocoa/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar_controller.mm index 3147738..92afce8 100644 --- a/chrome/browser/ui/cocoa/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar_controller.mm @@ -9,8 +9,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "app/mac/nsimage_cache.h" -#include "app/menus/accelerator_cocoa.h" -#include "app/menus/menu_model.h" #include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/singleton.h" @@ -57,6 +55,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/models/menu_model.h" namespace { @@ -101,16 +101,16 @@ const CGFloat kWrenchMenuLeftPadding = 3.0; namespace ToolbarControllerInternal { // A C++ delegate that handles the accelerators in the wrench menu. -class WrenchAcceleratorDelegate : public menus::AcceleratorProvider { +class WrenchAcceleratorDelegate : public ui::AcceleratorProvider { public: virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator_generic) { + ui::Accelerator* accelerator_generic) { // Downcast so that when the copy constructor is invoked below, the key // string gets copied, too. - menus::AcceleratorCocoa* out_accelerator = - static_cast<menus::AcceleratorCocoa*>(accelerator_generic); + ui::AcceleratorCocoa* out_accelerator = + static_cast<ui::AcceleratorCocoa*>(accelerator_generic); AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); - const menus::AcceleratorCocoa* accelerator = + const ui::AcceleratorCocoa* accelerator = keymap->GetAcceleratorForCommand(command_id); if (accelerator) { *out_accelerator = *accelerator; diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu_controller.mm index c57528b4..fdedecd 100644 --- a/chrome/browser/ui/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu_controller.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/wrench_menu_controller.h" #include "app/l10n_util.h" -#include "app/menus/menu_model.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_page_tracker.h" @@ -21,6 +20,7 @@ #include "chrome/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/models/menu_model.h" @interface WrenchMenuController (Private) - (void)adjustPositioning; @@ -67,11 +67,11 @@ class ZoomLevelObserver : public NotificationObserver { - (void)addItemToMenu:(NSMenu*)menu atIndex:(NSInteger)index - fromModel:(menus::MenuModel*)model + fromModel:(ui::MenuModel*)model modelIndex:(int)modelIndex { // Non-button item types should be built as normal items. - menus::MenuModel::ItemType type = model->GetTypeAt(modelIndex); - if (type != menus::MenuModel::TYPE_BUTTON_ITEM) { + ui::MenuModel::ItemType type = model->GetTypeAt(modelIndex); + if (type != ui::MenuModel::TYPE_BUTTON_ITEM) { [super addItemToMenu:menu atIndex:index fromModel:model diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc index bac41bd2..a53eeab 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.cc +++ b/chrome/browser/ui/gtk/accelerators_gtk.cc @@ -177,10 +177,10 @@ const struct AcceleratorMapping { AcceleratorsGtk::AcceleratorsGtk() { for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { int command_id = kAcceleratorMap[i].command_id; - menus::AcceleratorGtk accelerator(kAcceleratorMap[i].keyval, + ui::AcceleratorGtk accelerator(kAcceleratorMap[i].keyval, kAcceleratorMap[i].modifier_type); all_accelerators_.push_back( - std::pair<int, menus::AcceleratorGtk>(command_id, accelerator)); + std::pair<int, ui::AcceleratorGtk>(command_id, accelerator)); if (primary_accelerators_.find(command_id) == primary_accelerators_.end()) { @@ -196,9 +196,9 @@ AcceleratorsGtk* AcceleratorsGtk::GetInstance() { return Singleton<AcceleratorsGtk>::get(); } -const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( +const ui::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( int command_id) { - base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = + base::hash_map<int, ui::AcceleratorGtk>::const_iterator iter = primary_accelerators_.find(command_id); if (iter == primary_accelerators_.end()) diff --git a/chrome/browser/ui/gtk/accelerators_gtk.h b/chrome/browser/ui/gtk/accelerators_gtk.h index c1e953f..bf5a0ff 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.h +++ b/chrome/browser/ui/gtk/accelerators_gtk.h @@ -6,14 +6,14 @@ #define CHROME_BROWSER_UI_GTK_ACCELERATORS_GTK_H_ #pragma once -#include "app/menus/accelerator_gtk.h" #include "base/hash_tables.h" +#include "ui/base/models/accelerator_gtk.h" template <typename T> struct DefaultSingletonTraits; class AcceleratorsGtk { public: - typedef std::vector<std::pair<int, menus::AcceleratorGtk> > + typedef std::vector<std::pair<int, ui::AcceleratorGtk> > AcceleratorGtkList; typedef AcceleratorGtkList::const_iterator const_iterator; @@ -29,7 +29,7 @@ class AcceleratorsGtk { } // Returns NULL if there is no accelerator for the command. - const menus::AcceleratorGtk* GetPrimaryAcceleratorForCommand(int command_id); + const ui::AcceleratorGtk* GetPrimaryAcceleratorForCommand(int command_id); private: friend struct DefaultSingletonTraits<AcceleratorsGtk>; @@ -37,7 +37,7 @@ class AcceleratorsGtk { AcceleratorsGtk(); ~AcceleratorsGtk(); - base::hash_map<int, menus::AcceleratorGtk> primary_accelerators_; + base::hash_map<int, ui::AcceleratorGtk> primary_accelerators_; AcceleratorGtkList all_accelerators_; }; diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc index 12686e6..1ade2ff 100644 --- a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/menus/simple_menu_model.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" @@ -27,6 +26,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/models/simple_menu_model.h" #if defined(TOOLKIT_VIEWS) #include "views/controls/menu/menu_2.h" @@ -46,12 +46,12 @@ static const int kTreeHeight = 150; } // namespace class BookmarkEditorGtk::ContextMenuController - : public menus::SimpleMenuModel::Delegate { + : public ui::SimpleMenuModel::Delegate { public: explicit ContextMenuController(BookmarkEditorGtk* editor) : editor_(editor), running_menu_for_root_(false) { - menu_model_.reset(new menus::SimpleMenuModel(this)); + menu_model_.reset(new ui::SimpleMenuModel(this)); menu_model_->AddItemWithStringId(COMMAND_EDIT, IDS_EDIT); menu_model_->AddItemWithStringId( COMMAND_NEW_FOLDER, @@ -90,7 +90,7 @@ class BookmarkEditorGtk::ContextMenuController COMMAND_NEW_FOLDER }; - // Overridden from menus::SimpleMenuModel::Delegate: + // Overridden from ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdEnabled(int command_id) const { return !(command_id == COMMAND_EDIT && running_menu_for_root_) && (editor_ != NULL); @@ -101,7 +101,7 @@ class BookmarkEditorGtk::ContextMenuController } virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return false; } @@ -165,7 +165,7 @@ class BookmarkEditorGtk::ContextMenuController } // The model and view for the right click context menu. - scoped_ptr<menus::SimpleMenuModel> menu_model_; + scoped_ptr<ui::SimpleMenuModel> menu_model_; #if defined(TOOLKIT_VIEWS) scoped_ptr<views::Menu2> menu_; #else diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index d3c0934..c8abc9b 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -75,7 +75,7 @@ gint WidthForIconCount(gint icon_count) { } // namespace -using menus::SimpleMenuModel; +using ui::SimpleMenuModel; class BrowserActionButton : public NotificationObserver, public ImageLoadingTracker::Observer, @@ -660,7 +660,7 @@ bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const { bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return false; } diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h index 5df98a1..88b1de8 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h @@ -11,7 +11,6 @@ #include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" -#include "app/menus/simple_menu_model.h" #include "base/linked_ptr.h" #include "base/task.h" #include "chrome/browser/extensions/extension_toolbar_model.h" @@ -23,6 +22,7 @@ #include "chrome/common/notification_registrar.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/models/simple_menu_model.h" class Browser; class BrowserActionButton; @@ -36,7 +36,7 @@ typedef struct _GtkWidget GtkWidget; class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer, public ui::AnimationDelegate, public MenuGtk::Delegate, - public menus::SimpleMenuModel::Delegate, + public ui::SimpleMenuModel::Delegate, public NotificationObserver { public: explicit BrowserActionsToolbarGtk(Browser* browser); @@ -121,7 +121,7 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer, virtual bool IsCommandIdEnabled(int command_id) const; virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); virtual void ExecuteCommand(int command_id); // MenuGtk::Delegate implementation. @@ -186,7 +186,7 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer, // mode. In Chrome theme mode, the overflow button has a separator built in. GtkWidget* separator_; scoped_ptr<MenuGtk> overflow_menu_; - scoped_ptr<menus::SimpleMenuModel> overflow_menu_model_; + scoped_ptr<ui::SimpleMenuModel> overflow_menu_model_; GtkWidget* overflow_area_; // A widget for adding extra padding to the left of the overflow button. GtkWidget* overflow_alignment_; diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 77447f3..8412a17 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -141,9 +141,9 @@ GdkColor PickLuminosityContrastingColor(const GdkColor* base, // A menu model that builds the contents of the menu shown for popups (when the // user clicks on the favicon) and all of its submenus. -class PopupPageMenuModel : public menus::SimpleMenuModel { +class PopupPageMenuModel : public ui::SimpleMenuModel { public: - explicit PopupPageMenuModel(menus::SimpleMenuModel::Delegate* delegate, + explicit PopupPageMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser); virtual ~PopupPageMenuModel() { } @@ -161,9 +161,9 @@ class PopupPageMenuModel : public menus::SimpleMenuModel { }; PopupPageMenuModel::PopupPageMenuModel( - menus::SimpleMenuModel::Delegate* delegate, + ui::SimpleMenuModel::Delegate* delegate, Browser* browser) - : menus::SimpleMenuModel(delegate), browser_(browser) { + : ui::SimpleMenuModel(delegate), browser_(browser) { Build(); } @@ -847,8 +847,8 @@ void BrowserTitlebar::ExecuteCommand(int command_id) { } bool BrowserTitlebar::GetAcceleratorForCommandId( - int command_id, menus::Accelerator* accelerator) { - const menus::AcceleratorGtk* accelerator_gtk = + int command_id, ui::Accelerator* accelerator) { + const ui::AcceleratorGtk* accelerator_gtk = AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand( command_id); if (accelerator_gtk) @@ -936,7 +936,7 @@ void BrowserTitlebar::Throbber::InitFrames() { } BrowserTitlebar::ContextMenuModel::ContextMenuModel( - menus::SimpleMenuModel::Delegate* delegate) + ui::SimpleMenuModel::Delegate* delegate) : SimpleMenuModel(delegate) { AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); diff --git a/chrome/browser/ui/gtk/browser_titlebar.h b/chrome/browser/ui/gtk/browser_titlebar.h index 65dd78d..944057e 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.h +++ b/chrome/browser/ui/gtk/browser_titlebar.h @@ -14,11 +14,11 @@ #include <gtk/gtk.h> #include "app/active_window_watcher_x.h" -#include "app/menus/simple_menu_model.h" #include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "ui/base/models/simple_menu_model.h" class BrowserWindowGtk; class CustomDrawButton; @@ -29,7 +29,7 @@ class TabContents; class BrowserTitlebar : public NotificationObserver, public ActiveWindowWatcherX::Observer, - public menus::SimpleMenuModel::Delegate { + public ui::SimpleMenuModel::Delegate { public: // A default button order string for when we aren't asking gconf for the // metacity configuration. @@ -87,9 +87,9 @@ class BrowserTitlebar : public NotificationObserver, int current_waiting_frame_; }; - class ContextMenuModel : public menus::SimpleMenuModel { + class ContextMenuModel : public ui::SimpleMenuModel { public: - explicit ContextMenuModel(menus::SimpleMenuModel::Delegate* delegate); + explicit ContextMenuModel(ui::SimpleMenuModel::Delegate* delegate); }; // Build the titlebar, the space above the tab @@ -150,7 +150,7 @@ class BrowserTitlebar : public NotificationObserver, virtual bool IsCommandIdChecked(int command_id) const; virtual void ExecuteCommand(int command_id); virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); // Overridden from NotificationObserver: virtual void Observe(NotificationType type, diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index ea8a1b5..820a6a8 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -10,7 +10,6 @@ #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" -#include "app/menus/accelerator_gtk.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/i18n/rtl.h" @@ -53,6 +52,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/models/accelerator_gtk.h" namespace { @@ -332,12 +332,12 @@ bool BrowserToolbarGtk::AlwaysShowIconForCmd(int command_id) const { command_id == IDC_VIEW_BACKGROUND_PAGES; } -// menus::AcceleratorProvider +// ui::AcceleratorProvider bool BrowserToolbarGtk::GetAcceleratorForCommandId( int id, - menus::Accelerator* accelerator) { - const menus::AcceleratorGtk* accelerator_gtk = + ui::Accelerator* accelerator) { + const ui::AcceleratorGtk* accelerator_gtk = AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(id); if (accelerator_gtk) *accelerator = *accelerator_gtk; diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_toolbar_gtk.h index f090119..9611586 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.h @@ -12,8 +12,6 @@ #include "app/active_window_watcher_x.h" #include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" -#include "app/menus/accelerator.h" -#include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/gtk/custom_button.h" @@ -23,6 +21,8 @@ #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "ui/base/models/accelerator.h" +#include "ui/base/models/simple_menu_model.h" class BackForwardButtonGtk; class Browser; @@ -40,7 +40,7 @@ class ToolbarModel; // View class that displays the GTK version of the toolbar and routes gtk // events back to the Browser. class BrowserToolbarGtk : public CommandUpdater::CommandObserver, - public menus::AcceleratorProvider, + public ui::AcceleratorProvider, public MenuGtk::Delegate, public NotificationObserver { public: @@ -93,9 +93,9 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver, virtual GtkIconSet* GetIconSetForId(int idr); virtual bool AlwaysShowIconForCmd(int command_id) const; - // Overridden from menus::AcceleratorProvider: + // Overridden from ui::AcceleratorProvider: virtual bool GetAcceleratorForCommandId(int id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); // NotificationObserver implementation. virtual void Observe(NotificationType type, diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc index e0673cc..90d943c 100644 --- a/chrome/browser/ui/gtk/gtk_tree.cc +++ b/chrome/browser/ui/gtk/gtk_tree.cc @@ -4,12 +4,12 @@ #include "chrome/browser/gtk/gtk_tree.h" -#include "app/table_model.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/models/table_model.h" namespace gtk_tree { @@ -81,13 +81,13 @@ void GetSelectedIndices(GtkTreeSelection* selection, std::set<int>* out) { // TableAdapter TableAdapter::TableAdapter(Delegate* delegate, GtkListStore* list_store, - TableModel* table_model) + ui::TableModel* table_model) : delegate_(delegate), list_store_(list_store), table_model_(table_model) { if (table_model) table_model->SetObserver(this); } -void TableAdapter::SetModel(TableModel* table_model) { +void TableAdapter::SetModel(ui::TableModel* table_model) { table_model_ = table_model; table_model_->SetObserver(this); } @@ -125,8 +125,8 @@ void TableAdapter::MapListStoreIndicesToModelRows( return; } - const TableModel::Groups& groups = table_model_->GetGroups(); - TableModel::Groups::const_iterator group_it = groups.begin(); + const ui::TableModel::Groups& groups = table_model_->GetGroups(); + ui::TableModel::Groups::const_iterator group_it = groups.begin(); for (std::set<int>::const_iterator list_store_it = list_store_indices.begin(); list_store_it != list_store_indices.end(); ++list_store_it) { @@ -162,8 +162,8 @@ int TableAdapter::GetListStoreIndexForModelRow(int model_row) const { if (!table_model_->HasGroups()) return model_row; int group = table_model_->GetGroupID(model_row); - const TableModel::Groups& groups = table_model_->GetGroups(); - for (TableModel::Groups::const_iterator it = groups.begin(); + const ui::TableModel::Groups& groups = table_model_->GetGroups(); + for (ui::TableModel::Groups::const_iterator it = groups.begin(); it != groups.end(); ++it) { if (it->id == group) { return model_row + OffsetForGroupIndex(it - groups.begin()); @@ -202,8 +202,8 @@ void TableAdapter::OnModelChanged() { delegate_->OnModelChanged(); if (table_model_->HasGroups()) { - const TableModel::Groups& groups = table_model_->GetGroups(); - for (TableModel::Groups::const_iterator it = groups.begin(); + const ui::TableModel::Groups& groups = table_model_->GetGroups(); + for (ui::TableModel::Groups::const_iterator it = groups.begin(); it != groups.end(); ++it) { GtkTreeIter iter; if (it != groups.begin()) { @@ -341,7 +341,7 @@ gboolean TableAdapter::OnSelectionFilter(GtkTreeSelection* selection, //////////////////////////////////////////////////////////////////////////////// // TreeAdapter -TreeAdapter::TreeAdapter(Delegate* delegate, TreeModel* tree_model) +TreeAdapter::TreeAdapter(Delegate* delegate, ui::TreeModel* tree_model) : delegate_(delegate), tree_model_(tree_model) { tree_store_ = gtk_tree_store_new(COL_COUNT, @@ -369,15 +369,15 @@ void TreeAdapter::Init() { } -TreeModelNode* TreeAdapter::GetNode(GtkTreeIter* iter) { - TreeModelNode* node; +ui::TreeModelNode* TreeAdapter::GetNode(GtkTreeIter* iter) { + ui::TreeModelNode* node; gtk_tree_model_get(GTK_TREE_MODEL(tree_store_), iter, COL_NODE_PTR, &node, -1); return node; } -void TreeAdapter::FillRow(GtkTreeIter* iter, TreeModelNode* node) { +void TreeAdapter::FillRow(GtkTreeIter* iter, ui::TreeModelNode* node) { GdkPixbuf* pixbuf = NULL; int icon_index = tree_model_->GetIconIndex(node); if (icon_index >= 0 && icon_index < static_cast<int>(pixbufs_.size())) @@ -391,21 +391,22 @@ void TreeAdapter::FillRow(GtkTreeIter* iter, TreeModelNode* node) { -1); } -void TreeAdapter::Fill(GtkTreeIter* parent_iter, TreeModelNode* parent_node) { +void TreeAdapter::Fill(GtkTreeIter* parent_iter, + ui::TreeModelNode* parent_node) { if (parent_iter) FillRow(parent_iter, parent_node); GtkTreeIter iter; int child_count = tree_model_->GetChildCount(parent_node); for (int i = 0; i < child_count; ++i) { - TreeModelNode* node = tree_model_->GetChild(parent_node, i); + ui::TreeModelNode* node = tree_model_->GetChild(parent_node, i); gtk_tree_store_append(tree_store_, &iter, parent_iter); Fill(&iter, node); } } -GtkTreePath* TreeAdapter::GetTreePath(TreeModelNode* node) { +GtkTreePath* TreeAdapter::GetTreePath(ui::TreeModelNode* node) { GtkTreePath* path = gtk_tree_path_new(); - TreeModelNode* parent = node; + ui::TreeModelNode* parent = node; while (parent) { parent = tree_model_->GetParent(parent); if (parent) { @@ -417,7 +418,7 @@ GtkTreePath* TreeAdapter::GetTreePath(TreeModelNode* node) { return path; } -bool TreeAdapter::GetTreeIter(TreeModelNode* node, GtkTreeIter* iter) { +bool TreeAdapter::GetTreeIter(ui::TreeModelNode* node, GtkTreeIter* iter) { GtkTreePath* path = GetTreePath(node); bool rv = false; // Check the path ourselves since gtk_tree_model_get_iter prints a warning if @@ -429,8 +430,8 @@ bool TreeAdapter::GetTreeIter(TreeModelNode* node, GtkTreeIter* iter) { return rv; } -void TreeAdapter::TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, +void TreeAdapter::TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) { delegate_->OnAnyModelUpdateStart(); @@ -446,8 +447,8 @@ void TreeAdapter::TreeNodesAdded(TreeModel* model, delegate_->OnAnyModelUpdate(); } -void TreeAdapter::TreeNodesRemoved(TreeModel* model, - TreeModelNode* parent, +void TreeAdapter::TreeNodesRemoved(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) { delegate_->OnAnyModelUpdateStart(); @@ -462,7 +463,8 @@ void TreeAdapter::TreeNodesRemoved(TreeModel* model, delegate_->OnAnyModelUpdate(); } -void TreeAdapter::TreeNodeChanged(TreeModel* model, TreeModelNode* node) { +void TreeAdapter::TreeNodeChanged(ui::TreeModel* model, + ui::TreeModelNode* node) { delegate_->OnAnyModelUpdateStart(); GtkTreeIter iter; if (GetTreeIter(node, &iter)) diff --git a/chrome/browser/ui/gtk/gtk_tree.h b/chrome/browser/ui/gtk/gtk_tree.h index a37e5d1..d527a45 100644 --- a/chrome/browser/ui/gtk/gtk_tree.h +++ b/chrome/browser/ui/gtk/gtk_tree.h @@ -10,12 +10,14 @@ #include <set> #include <vector> -#include "app/table_model_observer.h" -#include "app/tree_model.h" #include "base/basictypes.h" #include "chrome/browser/remove_rows_table_model.h" +#include "ui/base/models/table_model_observer.h" +#include "ui/base/models/tree_model.h" +namespace ui { class TableModel; +} namespace gtk_tree { @@ -42,8 +44,8 @@ bool RemoveRecursively(GtkTreeStore* tree_store, GtkTreeIter* iter); // Writes all the indexes of selected rows into |out|. void GetSelectedIndices(GtkTreeSelection* selection, std::set<int>* out); -// A helper class for populating a GtkListStore from a TableModel. -class TableAdapter : public TableModelObserver { +// A helper class for populating a GtkListStore from a ui::TableModel. +class TableAdapter : public ui::TableModelObserver { public: enum ColumnID { @@ -61,16 +63,17 @@ class TableAdapter : public TableModelObserver { // Should fill in the column and row. virtual void SetColumnValues(int row, GtkTreeIter* iter) = 0; - // Called after any change to the TableModel but before the corresponding - // change to the GtkListStore. + // Called after any change to the ui::TableModel but before the + // corresponding change to the GtkListStore. virtual void OnAnyModelUpdateStart() {} - // Called after any change to the TableModel. + // Called after any change to the ui::TableModel. virtual void OnAnyModelUpdate() {} - // When the TableModel has been completely changed, called by OnModelChanged - // after clearing the list store. Can be overriden by the delegate if it - // needs to do extra initialization before the list store is populated. + // When the ui::TableModel has been completely changed, called by + // OnModelChanged after clearing the list store. Can be overridden by the + // delegate if it needs to do extra initialization before the list store is + // populated. virtual void OnModelChanged() {} protected: @@ -80,14 +83,14 @@ class TableAdapter : public TableModelObserver { // |table_model| may be NULL. TableAdapter(Delegate* delegate, GtkListStore* list_store, - TableModel* table_model); + ui::TableModel* table_model); virtual ~TableAdapter() {} - // Replace the TableModel with a different one. If the list store currenty - // has items this would cause weirdness, so this should generally only be - // called during the Delegate's OnModelChanged call, or if the adapter was - // created with a NULL |table_model|. - void SetModel(TableModel* table_model); + // Replace the ui::TableModel with a different one. If the list store + // currently has items this would cause weirdness, so this should generally + // only be called during the Delegate's OnModelChanged call, or if the adapter + // was created with a NULL |table_model|. + void SetModel(ui::TableModel* table_model); // Add all model rows corresponding to the given list store indices to |rows|. void MapListStoreIndicesToModelRows(const std::set<int>& list_store_indices, @@ -107,7 +110,7 @@ class TableAdapter : public TableModelObserver { gboolean path_currently_selected, gpointer user_data); - // TableModelObserver implementation. + // ui::TableModelObserver implementation. virtual void OnModelChanged(); virtual void OnItemsChanged(int start, int length); virtual void OnItemsAdded(int start, int length); @@ -121,19 +124,19 @@ class TableAdapter : public TableModelObserver { // Return the index into the list store for the given model row. int GetListStoreIndexForModelRow(int model_row) const; - // Add the values from |row| of the TableModel. + // Add the values from |row| of the ui::TableModel. void AddNodeToList(int row); Delegate* delegate_; GtkListStore* list_store_; - TableModel* table_model_; + ui::TableModel* table_model_; DISALLOW_COPY_AND_ASSIGN(TableAdapter); }; // A helper class for populating a GtkTreeStore from a TreeModel. // TODO(mattm): support SetRootShown(true) -class TreeAdapter : public TreeModelObserver { +class TreeAdapter : public ui::TreeModelObserver { public: // Column ids for |tree_store_|. enum { @@ -156,7 +159,7 @@ class TreeAdapter : public TreeModelObserver { virtual ~Delegate() {} }; - TreeAdapter(Delegate* delegate, TreeModel* tree_model); + TreeAdapter(Delegate* delegate, ui::TreeModel* tree_model); virtual ~TreeAdapter(); // Populate the tree store from the |tree_model_|. @@ -166,37 +169,37 @@ class TreeAdapter : public TreeModelObserver { GtkTreeStore* tree_store() { return tree_store_; } // Get the TreeModelNode corresponding to iter in the tree store. - TreeModelNode* GetNode(GtkTreeIter* iter); + ui::TreeModelNode* GetNode(GtkTreeIter* iter); // Begin TreeModelObserver implementation. - virtual void TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count); - virtual void TreeNodesRemoved(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesRemoved(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count); - virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node); + virtual void TreeNodeChanged(ui::TreeModel* model, ui::TreeModelNode* node); // End TreeModelObserver implementation. private: // Fill the tree store values for a given node. - void FillRow(GtkTreeIter* iter, TreeModelNode* node); + void FillRow(GtkTreeIter* iter, ui::TreeModelNode* node); // Fill the tree store for a row and all its descendants. - void Fill(GtkTreeIter* parent_iter, TreeModelNode* parent_node); + void Fill(GtkTreeIter* parent_iter, ui::TreeModelNode* parent_node); // Get the GtkTreePath in the tree store for the given node. // The returned path should be freed with gtk_tree_path_free. - GtkTreePath* GetTreePath(TreeModelNode* node); + GtkTreePath* GetTreePath(ui::TreeModelNode* node); // Get the GtkTreeIter in the tree store for the given node. - bool GetTreeIter(TreeModelNode* node, GtkTreeIter* iter); + bool GetTreeIter(ui::TreeModelNode* node, GtkTreeIter* iter); Delegate* delegate_; GtkTreeStore* tree_store_; - TreeModel* tree_model_; + ui::TreeModel* tree_model_; std::vector<GdkPixbuf*> pixbufs_; DISALLOW_COPY_AND_ASSIGN(TreeAdapter); diff --git a/chrome/browser/ui/gtk/keyword_editor_view.cc b/chrome/browser/ui/gtk/keyword_editor_view.cc index c9cd9e7..5463c57 100644 --- a/chrome/browser/ui/gtk/keyword_editor_view.cc +++ b/chrome/browser/ui/gtk/keyword_editor_view.cc @@ -298,7 +298,7 @@ void KeywordEditorView::OnModelChanged() { model_second_group_index_ = table_model_->last_search_engine_index(); gtk_list_store_clear(list_store_); - TableModel::Groups groups(table_model_->GetGroups()); + ui::TableModel::Groups groups(table_model_->GetGroups()); if (groups.size() != 2) { NOTREACHED(); return; diff --git a/chrome/browser/ui/gtk/keyword_editor_view.h b/chrome/browser/ui/gtk/keyword_editor_view.h index 0b138a0..9a08c67 100644 --- a/chrome/browser/ui/gtk/keyword_editor_view.h +++ b/chrome/browser/ui/gtk/keyword_editor_view.h @@ -8,20 +8,20 @@ #include <gtk/gtk.h> -#include "app/table_model_observer.h" #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "base/string16.h" #include "chrome/browser/search_engines/edit_search_engine_controller.h" #include "chrome/browser/search_engines/template_url_model_observer.h" +#include "ui/base/models/table_model_observer.h" class AccessibleWidgetHelper; class KeywordEditorController; class Profile; class TemplateURLTableModel; -class KeywordEditorView : public TableModelObserver, +class KeywordEditorView : public ui::TableModelObserver, public TemplateURLModelObserver, public EditSearchEngineControllerDelegate { public: @@ -77,7 +77,7 @@ class KeywordEditorView : public TableModelObserver, // Add the values from |row| of |table_model_|. void AddNodeToList(int row); - // TableModelObserver implementation. + // ui::TableModelObserver implementation. virtual void OnModelChanged(); virtual void OnItemsChanged(int start, int length); virtual void OnItemsAdded(int start, int length); diff --git a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc b/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc index 345f50a1..5f4043a 100644 --- a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc +++ b/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc @@ -55,7 +55,7 @@ class KeywordEditorViewTest : public testing::Test { // Ex: EXPECT_STREQ("!,_,A (Default),_,@,_,B", // GetDisplayedEngines(editor).c_str()); std::string GetDisplayedEngines(const KeywordEditorView& editor) { - TableModel::Groups groups(editor.table_model_->GetGroups()); + ui::TableModel::Groups groups(editor.table_model_->GetGroups()); std::vector<std::string> parts; GtkTreeModel* tree_model = GTK_TREE_MODEL(editor.list_store_); GtkTreeIter iter; diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index 4836ba6..08f836e 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -6,9 +6,6 @@ #include <map> -#include "app/menus/accelerator_gtk.h" -#include "app/menus/button_menu_item_model.h" -#include "app/menus/menu_model.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" @@ -20,6 +17,9 @@ #include "chrome/browser/gtk/gtk_util.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/models/accelerator_gtk.h" +#include "ui/base/models/button_menu_item_model.h" +#include "ui/base/models/menu_model.h" #include "webkit/glue/window_open_disposition.h" bool MenuGtk::block_activation_ = false; @@ -47,13 +47,13 @@ bool GetMenuItemID(GtkWidget* menu_item, int* menu_id) { return false; } -menus::MenuModel* ModelForMenuItem(GtkMenuItem* menu_item) { - return reinterpret_cast<menus::MenuModel*>( +ui::MenuModel* ModelForMenuItem(GtkMenuItem* menu_item) { + return reinterpret_cast<ui::MenuModel*>( g_object_get_data(G_OBJECT(menu_item), "model")); } void SetupButtonShowHandler(GtkWidget* button, - menus::ButtonMenuItemModel* model, + ui::ButtonMenuItemModel* model, int index) { g_object_set_data(G_OBJECT(button), "button-model", model); @@ -275,7 +275,7 @@ GtkWidget* MenuGtk::Delegate::GetImageForCommandId(int command_id) const { } MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, - menus::MenuModel* model) + ui::MenuModel* model) : delegate_(delegate), model_(model), dummy_accel_group_(gtk_accel_group_new()), @@ -343,7 +343,7 @@ GtkWidget* MenuGtk::AppendMenuItem(int command_id, GtkWidget* menu_item) { } GtkWidget* MenuGtk::AppendMenuItemToMenu(int index, - menus::MenuModel* model, + ui::MenuModel* model, GtkWidget* menu_item, GtkWidget* menu, bool connect_to_activate) { @@ -443,7 +443,7 @@ void MenuGtk::BuildMenuFromModel() { BuildSubmenuFromModel(model_, menu_); } -void MenuGtk::BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu) { +void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) { std::map<int, GtkWidget*> radio_groups; GtkWidget* menu_item = NULL; for (int i = 0; i < model->GetItemCount(); ++i) { @@ -454,15 +454,15 @@ void MenuGtk::BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu) { bool connect_to_activate = true; switch (model->GetTypeAt(i)) { - case menus::MenuModel::TYPE_SEPARATOR: + case ui::MenuModel::TYPE_SEPARATOR: menu_item = gtk_separator_menu_item_new(); break; - case menus::MenuModel::TYPE_CHECK: + case ui::MenuModel::TYPE_CHECK: menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str()); break; - case menus::MenuModel::TYPE_RADIO: { + case ui::MenuModel::TYPE_RADIO: { std::map<int, GtkWidget*>::iterator iter = radio_groups.find(model->GetGroupIdAt(i)); @@ -476,15 +476,15 @@ void MenuGtk::BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu) { } break; } - case menus::MenuModel::TYPE_BUTTON_ITEM: { - menus::ButtonMenuItemModel* button_menu_item_model = + case ui::MenuModel::TYPE_BUTTON_ITEM: { + ui::ButtonMenuItemModel* button_menu_item_model = model->GetButtonMenuItemAt(i); menu_item = BuildButtomMenuItem(button_menu_item_model, menu); connect_to_activate = false; break; } - case menus::MenuModel::TYPE_SUBMENU: - case menus::MenuModel::TYPE_COMMAND: { + case ui::MenuModel::TYPE_SUBMENU: + case ui::MenuModel::TYPE_COMMAND: { int command_id = model->GetCommandIdAt(i); if (model->GetIconAt(i, &icon)) menu_item = BuildMenuItemWithImage(label, icon); @@ -500,13 +500,13 @@ void MenuGtk::BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu) { NOTREACHED(); } - if (model->GetTypeAt(i) == menus::MenuModel::TYPE_SUBMENU) { + if (model->GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) { GtkWidget* submenu = gtk_menu_new(); BuildSubmenuFromModel(model->GetSubmenuModelAt(i), submenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu); } - menus::AcceleratorGtk accelerator; + ui::AcceleratorGtk accelerator; if (model->GetAcceleratorAt(i, &accelerator)) { gtk_widget_add_accelerator(menu_item, "activate", @@ -523,7 +523,7 @@ void MenuGtk::BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu) { } } -GtkWidget* MenuGtk::BuildButtomMenuItem(menus::ButtonMenuItemModel* model, +GtkWidget* MenuGtk::BuildButtomMenuItem(ui::ButtonMenuItemModel* model, GtkWidget* menu) { GtkWidget* menu_item = gtk_custom_menu_item_new( gfx::RemoveWindowsStyleAccelerators(UTF16ToUTF8(model->label())).c_str()); @@ -540,11 +540,11 @@ GtkWidget* MenuGtk::BuildButtomMenuItem(menus::ButtonMenuItemModel* model, GtkWidget* button = NULL; switch (model->GetTypeAt(i)) { - case menus::ButtonMenuItemModel::TYPE_SPACE: { + case ui::ButtonMenuItemModel::TYPE_SPACE: { gtk_custom_menu_item_add_space(GTK_CUSTOM_MENU_ITEM(menu_item)); break; } - case menus::ButtonMenuItemModel::TYPE_BUTTON: { + case ui::ButtonMenuItemModel::TYPE_BUTTON: { button = gtk_custom_menu_item_add_button( GTK_CUSTOM_MENU_ITEM(menu_item), model->GetCommandIdAt(i)); @@ -562,7 +562,7 @@ GtkWidget* MenuGtk::BuildButtomMenuItem(menus::ButtonMenuItemModel* model, SetupButtonShowHandler(button, model, i); break; } - case menus::ButtonMenuItemModel::TYPE_BUTTON_LABEL: { + case ui::ButtonMenuItemModel::TYPE_BUTTON_LABEL: { button = gtk_custom_menu_item_add_button_label( GTK_CUSTOM_MENU_ITEM(menu_item), model->GetCommandIdAt(i)); @@ -610,7 +610,7 @@ void MenuGtk::OnMenuItemActivated(GtkWidget* menuitem) { if (!GetMenuItemID(menuitem, &id)) return; - menus::MenuModel* model = ModelForMenuItem(GTK_MENU_ITEM(menuitem)); + ui::MenuModel* model = ModelForMenuItem(GTK_MENU_ITEM(menuitem)); // The menu item can still be activated by hotkeys even if it is disabled. if (model->IsEnabledAt(id)) @@ -618,8 +618,8 @@ void MenuGtk::OnMenuItemActivated(GtkWidget* menuitem) { } void MenuGtk::OnMenuButtonPressed(GtkWidget* menu_item, int command_id) { - menus::ButtonMenuItemModel* model = - reinterpret_cast<menus::ButtonMenuItemModel*>( + ui::ButtonMenuItemModel* model = + reinterpret_cast<ui::ButtonMenuItemModel*>( g_object_get_data(G_OBJECT(menu_item), "button-model")); if (model && model->IsCommandIdEnabled(command_id)) { if (delegate_) @@ -632,8 +632,8 @@ void MenuGtk::OnMenuButtonPressed(GtkWidget* menu_item, int command_id) { gboolean MenuGtk::OnMenuTryButtonPressed(GtkWidget* menu_item, int command_id) { gboolean pressed = FALSE; - menus::ButtonMenuItemModel* model = - reinterpret_cast<menus::ButtonMenuItemModel*>( + ui::ButtonMenuItemModel* model = + reinterpret_cast<ui::ButtonMenuItemModel*>( g_object_get_data(G_OBJECT(menu_item), "button-model")); if (model && model->IsCommandIdEnabled(command_id) && @@ -710,7 +710,7 @@ void MenuGtk::PointMenuPositionFunc(GtkMenu* menu, *y = CalculateMenuYPosition(&screen_rect, &menu_req, NULL, *y); } -void MenuGtk::ExecuteCommand(menus::MenuModel* model, int id) { +void MenuGtk::ExecuteCommand(ui::MenuModel* model, int id) { if (delegate_) delegate_->CommandWillBeExecuted(); @@ -738,8 +738,8 @@ void MenuGtk::OnMenuHidden(GtkWidget* widget) { // static void MenuGtk::SetButtonItemInfo(GtkWidget* button, gpointer userdata) { - menus::ButtonMenuItemModel* model = - reinterpret_cast<menus::ButtonMenuItemModel*>( + ui::ButtonMenuItemModel* model = + reinterpret_cast<ui::ButtonMenuItemModel*>( g_object_get_data(G_OBJECT(button), "button-model")); int index = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(button), "button-model-id")); @@ -766,7 +766,7 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) { if (!GetMenuItemID(widget, &id)) return; - menus::MenuModel* model = ModelForMenuItem(GTK_MENU_ITEM(widget)); + ui::MenuModel* model = ModelForMenuItem(GTK_MENU_ITEM(widget)); if (!model) { // If we're not providing the sub menu, then there's no model. For // example, the IME submenu doesn't have a model. diff --git a/chrome/browser/ui/gtk/menu_gtk.h b/chrome/browser/ui/gtk/menu_gtk.h index 1802caa..abe78a6 100644 --- a/chrome/browser/ui/gtk/menu_gtk.h +++ b/chrome/browser/ui/gtk/menu_gtk.h @@ -17,7 +17,7 @@ class SkBitmap; -namespace menus { +namespace ui { class ButtonMenuItemModel; class MenuModel; } @@ -54,7 +54,7 @@ class MenuGtk { static GtkWidget* GetDefaultImageForCommandId(int command_id); }; - MenuGtk(MenuGtk::Delegate* delegate, menus::MenuModel* model); + MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model); ~MenuGtk(); // Initialize GTK signal handlers. @@ -70,7 +70,7 @@ class MenuGtk { GtkWidget* AppendSeparator(); GtkWidget* AppendMenuItem(int command_id, GtkWidget* menu_item); GtkWidget* AppendMenuItemToMenu(int index, - menus::MenuModel* model, + ui::MenuModel* model, GtkWidget* menu_item, GtkWidget* menu, bool connect_to_activate); @@ -139,12 +139,12 @@ class MenuGtk { // A function that creates a GtkMenu from |model_|. void BuildMenuFromModel(); // Implementation of the above; called recursively. - void BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu); + void BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu); // Builds a menu item with buttons in it from the data in the model. - GtkWidget* BuildButtomMenuItem(menus::ButtonMenuItemModel* model, + GtkWidget* BuildButtomMenuItem(ui::ButtonMenuItemModel* model, GtkWidget* menu); - void ExecuteCommand(menus::MenuModel* model, int id); + void ExecuteCommand(ui::MenuModel* model, int id); // Callback for when a menu item is clicked. CHROMEGTK_CALLBACK_0(MenuGtk, void, OnMenuItemActivated); @@ -174,7 +174,7 @@ class MenuGtk { // If non-NULL, the MenuModel that we use to populate and control the GTK // menu (overriding the delegate as a controller). - menus::MenuModel* model_; + ui::MenuModel* model_; // For some menu items, we want to show the accelerator, but not actually // explicitly handle it. To this end we connect those menu items' accelerators diff --git a/chrome/browser/ui/gtk/options/languages_page_gtk.cc b/chrome/browser/ui/gtk/options/languages_page_gtk.cc index 659b49a..1da7e37 100644 --- a/chrome/browser/ui/gtk/options/languages_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/languages_page_gtk.cc @@ -27,7 +27,7 @@ namespace { const int kWrapWidth = 475; -GtkWidget* NewComboboxFromModel(ComboboxModel* model) { +GtkWidget* NewComboboxFromModel(ui::ComboboxModel* model) { GtkWidget* combobox = gtk_combo_box_new_text(); int count = model->GetItemCount(); for (int i = 0; i < count; ++i) diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc index 2891b46..5c6211d 100644 --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc +++ b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc @@ -47,7 +47,7 @@ void StatusIconGtk::OnClick(GtkWidget* widget) { DispatchClickEvent(); } -void StatusIconGtk::UpdatePlatformContextMenu(menus::MenuModel* model) { +void StatusIconGtk::UpdatePlatformContextMenu(ui::MenuModel* model) { if (!model) menu_.reset(); else diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.h b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.h index cc9a3cd..686fb6e 100644 --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.h +++ b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.h @@ -29,7 +29,7 @@ class StatusIconGtk : public StatusIcon { protected: // Overridden from StatusIcon. - virtual void UpdatePlatformContextMenu(menus::MenuModel* menu); + virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); private: // Callback invoked when user right-clicks on the status icon. diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc index afc12ae..3b2b373 100644 --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -12,6 +11,7 @@ #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/models/simple_menu_model.h" namespace { @@ -34,7 +34,7 @@ TEST(StatusTrayGtkTest, CreateIcon) { icon->SetImage(*bitmap); icon->SetPressedImage(*bitmap); icon->SetToolTip(ASCIIToUTF16("tool tip")); - menus::SimpleMenuModel* menu = new menus::SimpleMenuModel(NULL); + ui::SimpleMenuModel* menu = new ui::SimpleMenuModel(NULL); menu->AddItem(0, ASCIIToUTF16("foo")); icon->SetContextMenu(menu); } diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_gtk.cc index ae6de10..764b136 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_gtk.cc @@ -7,7 +7,6 @@ #include <gdk/gdkkeysyms.h> #include "app/gtk_dnd_util.h" -#include "app/menus/accelerator_gtk.h" #include "base/singleton.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -17,6 +16,7 @@ #include "gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/models/accelerator_gtk.h" namespace { @@ -31,7 +31,7 @@ int GetTitleWidth(gfx::Font* font, string16 title) { } // namespace -class TabGtk::ContextMenuController : public menus::SimpleMenuModel::Delegate, +class TabGtk::ContextMenuController : public ui::SimpleMenuModel::Delegate, public MenuGtk::Delegate { public: explicit ContextMenuController(TabGtk* tab) @@ -52,7 +52,7 @@ class TabGtk::ContextMenuController : public menus::SimpleMenuModel::Delegate, } private: - // Overridden from menus::SimpleMenuModel::Delegate: + // Overridden from ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const { return false; } @@ -63,12 +63,12 @@ class TabGtk::ContextMenuController : public menus::SimpleMenuModel::Delegate, } virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { int browser_command; if (!TabStripModel::ContextMenuCommandToBrowserCommand(command_id, &browser_command)) return false; - const menus::AcceleratorGtk* accelerator_gtk = + const ui::AcceleratorGtk* accelerator_gtk = AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand( browser_command); if (accelerator_gtk) diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index b032e20..45459c7 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -12,7 +12,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "base/auto_reset.h" #include "base/command_line.h" @@ -32,6 +31,7 @@ #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/models/simple_menu_model.h" #if defined(TOOLKIT_VIEWS) #include "views/controls/menu/menu_2.h" @@ -214,11 +214,11 @@ void TreeViewColumnSetWidth(GtkTreeViewColumn* column, gint width) { } // namespace class TaskManagerGtk::ContextMenuController - : public menus::SimpleMenuModel::Delegate { + : public ui::SimpleMenuModel::Delegate { public: explicit ContextMenuController(TaskManagerGtk* task_manager) : task_manager_(task_manager) { - menu_model_.reset(new menus::SimpleMenuModel(this)); + menu_model_.reset(new ui::SimpleMenuModel(this)); for (int i = kTaskManagerPage; i < kTaskManagerColumnCount; i++) { menu_model_->AddCheckItemWithStringId( i, TaskManagerColumnIDToResourceID(i)); @@ -252,7 +252,7 @@ class TaskManagerGtk::ContextMenuController } private: - // menus::SimpleMenuModel::Delegate implementation: + // ui::SimpleMenuModel::Delegate implementation: virtual bool IsCommandIdEnabled(int command_id) const { if (!task_manager_) return false; @@ -270,7 +270,7 @@ class TaskManagerGtk::ContextMenuController virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return false; } @@ -284,7 +284,7 @@ class TaskManagerGtk::ContextMenuController } // The model and view for the right click context menu. - scoped_ptr<menus::SimpleMenuModel> menu_model_; + scoped_ptr<ui::SimpleMenuModel> menu_model_; #if defined(TOOLKIT_VIEWS) scoped_ptr<views::Menu2> menu_; #else diff --git a/chrome/browser/ui/tabs/tab_menu_model.cc b/chrome/browser/ui/tabs/tab_menu_model.cc index 0004fa6..907969d 100644 --- a/chrome/browser/ui/tabs/tab_menu_model.cc +++ b/chrome/browser/ui/tabs/tab_menu_model.cc @@ -9,9 +9,9 @@ #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" -TabMenuModel::TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, +TabMenuModel::TabMenuModel(ui::SimpleMenuModel::Delegate* delegate, bool is_pinned) - : menus::SimpleMenuModel(delegate) { + : ui::SimpleMenuModel(delegate) { Build(is_pinned); } diff --git a/chrome/browser/ui/tabs/tab_menu_model.h b/chrome/browser/ui/tabs/tab_menu_model.h index aeff953..61a8e34 100644 --- a/chrome/browser/ui/tabs/tab_menu_model.h +++ b/chrome/browser/ui/tabs/tab_menu_model.h @@ -6,15 +6,15 @@ #define CHROME_BROWSER_UI_TABS_TAB_MENU_MODEL_H_ #pragma once -#include "app/menus/simple_menu_model.h" +#include "ui/base/models/simple_menu_model.h" // A menu model that builds the contents of the tab context menu. This menu has // only one level (no submenus). TabMenuModel caches local state from the // tab (such as the pinned state). To make sure the menu reflects the real state // of the tab a new TabMenuModel should be created each time the menu is shown. -class TabMenuModel : public menus::SimpleMenuModel { +class TabMenuModel : public ui::SimpleMenuModel { public: - TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, bool is_pinned); + TabMenuModel(ui::SimpleMenuModel::Delegate* delegate, bool is_pinned); virtual ~TabMenuModel() {} // Returns true if vertical tabs are enabled. diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 9874ef9..5ef55c165 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -59,7 +59,7 @@ int BackForwardMenuModel::GetItemCount() const { return items; } -menus::MenuModel::ItemType BackForwardMenuModel::GetTypeAt(int index) const { +ui::MenuModel::ItemType BackForwardMenuModel::GetTypeAt(int index) const { return IsSeparator(index) ? TYPE_SEPARATOR : TYPE_COMMAND; } @@ -98,7 +98,7 @@ bool BackForwardMenuModel::IsItemDynamicAt(int index) const { bool BackForwardMenuModel::GetAcceleratorAt( int index, - menus::Accelerator* accelerator) const { + ui::Accelerator* accelerator) const { return false; } @@ -125,7 +125,7 @@ bool BackForwardMenuModel::GetIconAt(int index, SkBitmap* icon) const { return true; } -menus::ButtonMenuItemModel* BackForwardMenuModel::GetButtonMenuItemAt( +ui::ButtonMenuItemModel* BackForwardMenuModel::GetButtonMenuItemAt( int index) const { return NULL; } @@ -134,7 +134,7 @@ bool BackForwardMenuModel::IsEnabledAt(int index) const { return index < GetItemCount() && !IsSeparator(index); } -menus::MenuModel* BackForwardMenuModel::GetSubmenuModelAt(int index) const { +ui::MenuModel* BackForwardMenuModel::GetSubmenuModelAt(int index) const { return NULL; } diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index 1d669a0..d256f0c 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h @@ -8,10 +8,10 @@ #include <string> -#include "app/menus/menu_model.h" #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/string16.h" +#include "ui/base/models/menu_model.h" #include "webkit/glue/window_open_disposition.h" class Browser; @@ -26,7 +26,7 @@ class NavigationEntry; // Interface for the showing of the dropdown menu for the Back/Forward buttons. // Actual implementations are platform-specific. /////////////////////////////////////////////////////////////////////////////// -class BackForwardMenuModel : public menus::MenuModel { +class BackForwardMenuModel : public ui::MenuModel { public: // These are IDs used to identify individual UI elements within the // browser window using View::GetViewByID. @@ -50,11 +50,11 @@ class BackForwardMenuModel : public menus::MenuModel { virtual string16 GetLabelAt(int index) const; virtual bool IsItemDynamicAt(int index) const; virtual bool GetAcceleratorAt(int index, - menus::Accelerator* accelerator) const; + ui::Accelerator* accelerator) const; virtual bool IsItemCheckedAt(int index) const; virtual int GetGroupIdAt(int index) const; virtual bool GetIconAt(int index, SkBitmap* icon) const; - virtual menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const; + virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const; virtual bool IsEnabledAt(int index) const; virtual MenuModel* GetSubmenuModelAt(int index) const; virtual void HighlightChangedTo(int index); diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 7a9a9ba..b3d9c5f 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -8,7 +8,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/menus/button_menu_item_model.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" @@ -36,6 +35,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/models/button_menu_item_model.h" #if defined(OS_LINUX) #include <gtk/gtk.h> @@ -59,7 +59,7 @@ // EncodingMenuModel EncodingMenuModel::EncodingMenuModel(Browser* browser) - : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)), + : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), browser_(browser) { Build(); } @@ -116,7 +116,7 @@ bool EncodingMenuModel::IsCommandIdEnabled(int command_id) const { bool EncodingMenuModel::GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return false; } @@ -127,7 +127,7 @@ void EncodingMenuModel::ExecuteCommand(int command_id) { //////////////////////////////////////////////////////////////////////////////// // ZoomMenuModel -ZoomMenuModel::ZoomMenuModel(menus::SimpleMenuModel::Delegate* delegate) +ZoomMenuModel::ZoomMenuModel(ui::SimpleMenuModel::Delegate* delegate) : SimpleMenuModel(delegate) { Build(); } @@ -144,7 +144,7 @@ void ZoomMenuModel::Build() { //////////////////////////////////////////////////////////////////////////////// // ToolsMenuModel -ToolsMenuModel::ToolsMenuModel(menus::SimpleMenuModel::Delegate* delegate, +ToolsMenuModel::ToolsMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser) : SimpleMenuModel(delegate) { Build(browser); @@ -189,9 +189,9 @@ void ToolsMenuModel::Build(Browser* browser) { //////////////////////////////////////////////////////////////////////////////// // WrenchMenuModel -WrenchMenuModel::WrenchMenuModel(menus::AcceleratorProvider* provider, +WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser) - : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)), + : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), provider_(provider), browser_(browser), tabstrip_model_(browser_->tabstrip_model()) { @@ -321,7 +321,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_id) const { bool WrenchMenuModel::GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return provider_->GetAcceleratorForCommandId(command_id, accelerator); } @@ -363,7 +363,7 @@ void WrenchMenuModel::Observe(NotificationType type, // For testing. WrenchMenuModel::WrenchMenuModel() - : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)), + : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), provider_(NULL), browser_(NULL), tabstrip_model_(NULL) { @@ -380,7 +380,7 @@ void WrenchMenuModel::Build() { // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the // layout for this menu item in Toolbar.xib. It does, however, use the // command_id value from AddButtonItem() to identify this special item. - edit_menu_item_model_.reset(new menus::ButtonMenuItemModel(IDS_EDIT, this)); + edit_menu_item_model_.reset(new ui::ButtonMenuItemModel(IDS_EDIT, this)); edit_menu_item_model_->AddGroupItemWithStringId(IDC_CUT, IDS_CUT); edit_menu_item_model_->AddGroupItemWithStringId(IDC_COPY, IDS_COPY); edit_menu_item_model_->AddGroupItemWithStringId(IDC_PASTE, IDS_PASTE); @@ -394,7 +394,7 @@ void WrenchMenuModel::Build() { #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)) // WARNING: See above comment. zoom_menu_item_model_.reset( - new menus::ButtonMenuItemModel(IDS_ZOOM_MENU, this)); + new ui::ButtonMenuItemModel(IDS_ZOOM_MENU, this)); zoom_menu_item_model_->AddGroupItemWithStringId( IDC_ZOOM_MINUS, IDS_ZOOM_MINUS2); zoom_menu_item_model_->AddButtonLabel(IDC_ZOOM_PERCENT_DISPLAY, diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index 5ebf7ee..8886de2 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ #pragma once -#include "app/menus/accelerator.h" -#include "app/menus/button_menu_item_model.h" -#include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "chrome/browser/tabs/tab_strip_model_observer.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "ui/base/models/accelerator.h" +#include "ui/base/models/button_menu_item_model.h" +#include "ui/base/models/simple_menu_model.h" class Browser; class TabStripModel; @@ -22,17 +22,17 @@ class MockWrenchMenuModel; } // namespace // A menu model that builds the contents of an encoding menu. -class EncodingMenuModel : public menus::SimpleMenuModel, - public menus::SimpleMenuModel::Delegate { +class EncodingMenuModel : public ui::SimpleMenuModel, + public ui::SimpleMenuModel::Delegate { public: explicit EncodingMenuModel(Browser* browser); virtual ~EncodingMenuModel(); - // Overridden from menus::SimpleMenuModel::Delegate: + // Overridden from ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const; virtual bool IsCommandIdEnabled(int command_id) const; virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); virtual void ExecuteCommand(int command_id); private: @@ -44,9 +44,9 @@ class EncodingMenuModel : public menus::SimpleMenuModel, }; // A menu model that builds the contents of the zoom menu. -class ZoomMenuModel : public menus::SimpleMenuModel { +class ZoomMenuModel : public ui::SimpleMenuModel { public: - explicit ZoomMenuModel(menus::SimpleMenuModel::Delegate* delegate); + explicit ZoomMenuModel(ui::SimpleMenuModel::Delegate* delegate); virtual ~ZoomMenuModel(); private: @@ -55,9 +55,9 @@ class ZoomMenuModel : public menus::SimpleMenuModel { DISALLOW_COPY_AND_ASSIGN(ZoomMenuModel); }; -class ToolsMenuModel : public menus::SimpleMenuModel { +class ToolsMenuModel : public ui::SimpleMenuModel { public: - ToolsMenuModel(menus::SimpleMenuModel::Delegate* delegate, Browser* browser); + ToolsMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser); virtual ~ToolsMenuModel(); private: @@ -69,13 +69,13 @@ class ToolsMenuModel : public menus::SimpleMenuModel { }; // A menu model that builds the contents of the wrench menu. -class WrenchMenuModel : public menus::SimpleMenuModel, - public menus::SimpleMenuModel::Delegate, - public menus::ButtonMenuItemModel::Delegate, +class WrenchMenuModel : public ui::SimpleMenuModel, + public ui::SimpleMenuModel::Delegate, + public ui::ButtonMenuItemModel::Delegate, public TabStripModelObserver, public NotificationObserver { public: - WrenchMenuModel(menus::AcceleratorProvider* provider, Browser* browser); + WrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser); virtual ~WrenchMenuModel(); // Overridden for ButtonMenuItemModel::Delegate: @@ -91,7 +91,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel, virtual bool IsCommandIdVisible(int command_id) const; virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); // Overridden from TabStripModelObserver: virtual void TabSelectedAt(TabContentsWrapper* old_contents, @@ -130,8 +130,8 @@ class WrenchMenuModel : public menus::SimpleMenuModel, string16 GetSyncMenuLabel() const; // Models for the special menu items with buttons. - scoped_ptr<menus::ButtonMenuItemModel> edit_menu_item_model_; - scoped_ptr<menus::ButtonMenuItemModel> zoom_menu_item_model_; + scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_; + scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_; // Label of the zoom label in the zoom menu item. string16 zoom_label_; @@ -139,7 +139,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel, // Tools menu. scoped_ptr<ToolsMenuModel> tools_menu_model_; - menus::AcceleratorProvider* provider_; // weak + ui::AcceleratorProvider* provider_; // weak Browser* browser_; // weak TabStripModel* tabstrip_model_; // weak diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc index 02a41a6..9e88848 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc @@ -13,12 +13,12 @@ #include "testing/gtest/include/gtest/gtest.h" class WrenchMenuModelTest : public BrowserWithTestWindowTest, - public menus::AcceleratorProvider { + public ui::AcceleratorProvider { public: // Don't handle accelerators. virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { return false; } + ui::Accelerator* accelerator) { return false; } }; // Copies parts of MenuModelTest::Delegate and combines them with the @@ -26,7 +26,7 @@ class WrenchMenuModelTest : public BrowserWithTestWindowTest, // not derived from SimpleMenuModel. class TestWrenchMenuModel : public WrenchMenuModel { public: - TestWrenchMenuModel(menus::AcceleratorProvider* provider, + TestWrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser) : WrenchMenuModel(provider, browser), execute_count_(0), @@ -34,7 +34,7 @@ class TestWrenchMenuModel : public WrenchMenuModel { enable_count_(0) { } - // Testing overrides to menus::SimpleMenuModel::Delegate: + // Testing overrides to ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const { bool val = WrenchMenuModel::IsCommandIdChecked(command_id); if (val) @@ -80,13 +80,13 @@ TEST_F(WrenchMenuModelTest, Basics) { // the delegate as well. Use the first submenu as the tools one. int toolsModelIndex = -1; for (int i = 0; i < itemCount; ++i) { - if (model.GetTypeAt(i) == menus::MenuModel::TYPE_SUBMENU) { + if (model.GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) { toolsModelIndex = i; break; } } EXPECT_GT(toolsModelIndex, -1); - menus::MenuModel* toolsModel = model.GetSubmenuModelAt(toolsModelIndex); + ui::MenuModel* toolsModel = model.GetSubmenuModelAt(toolsModelIndex); EXPECT_TRUE(toolsModel); EXPECT_GT(toolsModel->GetItemCount(), 2); toolsModel->ActivatedAt(2); diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index 3b1670da..f013d83 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -1278,10 +1278,11 @@ string16 AutoFillProfilesView::ContentListTableModel::GetText( } } -TableModel::Groups AutoFillProfilesView::ContentListTableModel::GetGroups() { - TableModel::Groups groups; +ui::TableModel::Groups + AutoFillProfilesView::ContentListTableModel::GetGroups() { + ui::TableModel::Groups groups; - TableModel::Group profile_group; + ui::TableModel::Group profile_group; profile_group.title = l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESSES_GROUP_NAME); profile_group.id = kAddressGroup; @@ -1303,7 +1304,7 @@ int AutoFillProfilesView::ContentListTableModel::GetGroupID(int row) { } void AutoFillProfilesView::ContentListTableModel::SetObserver( - TableModelObserver* observer) { + ui::TableModelObserver* observer) { observer_ = observer; } diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.h b/chrome/browser/ui/views/autofill_profiles_view_win.h index b758b5a..45eabaf 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.h +++ b/chrome/browser/ui/views/autofill_profiles_view_win.h @@ -10,8 +10,6 @@ #include <map> #include <vector> -#include "app/combobox_model.h" -#include "app/table_model.h" #include "base/compiler_specific.h" #include "base/string16.h" #include "chrome/browser/autofill/autofill_dialog.h" @@ -19,6 +17,8 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/common/notification_observer.h" +#include "ui/base/models/combobox_model.h" +#include "ui/base/models/table_model.h" #include "views/controls/combobox/combobox.h" #include "views/controls/link.h" #include "views/controls/table/table_view_observer.h" @@ -358,7 +358,7 @@ class AutoFillProfilesView : public views::View, DISALLOW_COPY_AND_ASSIGN(EditableSetViewContents); }; - class StringVectorComboboxModel : public ComboboxModel { + class StringVectorComboboxModel : public ui::ComboboxModel { public: StringVectorComboboxModel() {} virtual ~StringVectorComboboxModel() {} @@ -367,7 +367,7 @@ class AutoFillProfilesView : public views::View, // |source|. void set_cb_strings(std::vector<std::wstring> *source); - // Overridden from ComboboxModel: + // Overridden from ui::ComboboxModel: virtual int GetItemCount(); virtual string16 GetItemAt(int index); @@ -381,7 +381,7 @@ class AutoFillProfilesView : public views::View, }; // Model for scrolling credit cards and addresses. - class ContentListTableModel : public TableModel { + class ContentListTableModel : public ui::TableModel { public: ContentListTableModel(std::vector<EditableSetInfo>* profiles, std::vector<EditableSetInfo>* credit_cards); @@ -398,18 +398,18 @@ class AutoFillProfilesView : public views::View, void RemoveItem(int index); void UpdateItem(int index); - // TableModel members: + // ui::TableModel members: virtual int RowCount() OVERRIDE; virtual string16 GetText(int row, int column_id) OVERRIDE; virtual bool HasGroups() OVERRIDE { return true; } - virtual TableModel::Groups GetGroups() OVERRIDE; + virtual ui::TableModel::Groups GetGroups() OVERRIDE; virtual int GetGroupID(int row) OVERRIDE; - virtual void SetObserver(TableModelObserver* observer) OVERRIDE; + virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; private: std::vector<EditableSetInfo>* profiles_; std::vector<EditableSetInfo>* credit_cards_; - TableModelObserver* observer_; + ui::TableModelObserver* observer_; DISALLOW_COPY_AND_ASSIGN(ContentListTableModel); }; diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmark_editor_view.cc index 8ae0c5d..d0c3e69 100644 --- a/chrome/browser/ui/views/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmark_editor_view.cc @@ -174,7 +174,7 @@ void BookmarkEditorView::OnTreeViewSelectionChanged( } bool BookmarkEditorView::CanEdit(views::TreeView* tree_view, - TreeModelNode* node) { + ui::TreeModelNode* node) { // Only allow editting of children of the bookmark bar node and other node. EditorNode* bb_node = tree_model_->AsNode(node); return (bb_node->GetParent() && bb_node->GetParent()->GetParent()); @@ -208,7 +208,7 @@ bool BookmarkEditorView::IsCommandIdEnabled(int command_id) const { bool BookmarkEditorView::GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return GetWidget()->GetAccelerator(command_id, accelerator); } @@ -249,7 +249,7 @@ void BookmarkEditorView::ShowContextMenu(View* source, (tree_model_->GetParent(tree_view_->GetSelectedNode()) == tree_model_->GetRoot()); if (!context_menu_contents_.get()) { - context_menu_contents_.reset(new menus::SimpleMenuModel(this)); + context_menu_contents_.reset(new ui::SimpleMenuModel(this)); context_menu_contents_->AddItemWithStringId(IDS_EDIT, IDS_EDIT); context_menu_contents_->AddItemWithStringId( IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM, diff --git a/chrome/browser/ui/views/bookmark_editor_view.h b/chrome/browser/ui/views/bookmark_editor_view.h index f6da363..d090c48 100644 --- a/chrome/browser/ui/views/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmark_editor_view.h @@ -6,8 +6,6 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARK_EDITOR_VIEW_H_ #pragma once -#include "app/menus/simple_menu_model.h" -#include "app/tree_node_model.h" #include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" @@ -16,6 +14,8 @@ #include "views/controls/tree/tree_view.h" #include "views/window/dialog_delegate.h" #include "testing/gtest/include/gtest/gtest_prod.h" +#include "ui/base/models/simple_menu_model.h" +#include "ui/base/models/tree_node_model.h" namespace views { class Label; @@ -46,20 +46,20 @@ class BookmarkEditorView : public BookmarkEditor, public views::DialogDelegate, public views::Textfield::Controller, public views::ContextMenuController, - public menus::SimpleMenuModel::Delegate, + public ui::SimpleMenuModel::Delegate, public BookmarkModelObserver { public: // Type of node in the tree. Public purely for testing. - typedef TreeNodeWithValue<int64> EditorNode; + typedef ui::TreeNodeWithValue<int64> EditorNode; // Model for the TreeView. Trivial subclass that doesn't allow titles with // empty strings. Public purely for testing. - class EditorTreeModel : public TreeNodeModel<EditorNode> { + class EditorTreeModel : public ui::TreeNodeModel<EditorNode> { public: explicit EditorTreeModel(EditorNode* root) - : TreeNodeModel<EditorNode>(root) {} + : ui::TreeNodeModel<EditorNode>(root) {} - virtual void SetTitle(TreeModelNode* node, + virtual void SetTitle(ui::TreeModelNode* node, const string16& title) { if (!title.empty()) TreeNodeModel::SetTitle(node, title); @@ -94,7 +94,7 @@ class BookmarkEditorView : public BookmarkEditor, // TreeViewObserver methods. virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view); - virtual bool CanEdit(views::TreeView* tree_view, TreeModelNode* node); + virtual bool CanEdit(views::TreeView* tree_view, ui::TreeModelNode* node); // Textfield::Controller methods. virtual void ContentsChanged(views::Textfield* sender, @@ -107,11 +107,11 @@ class BookmarkEditorView : public BookmarkEditor, // NativeButton. virtual void ButtonPressed(views::Button* sender, const views::Event& event); - // menus::SimpleMenuModel::Delegate. + // ui::SimpleMenuModel::Delegate. virtual bool IsCommandIdChecked(int command_id) const; virtual bool IsCommandIdEnabled(int command_id) const; virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); virtual void ExecuteCommand(int command_id); // Creates a Window and adds the BookmarkEditorView to it. When the window is @@ -247,7 +247,7 @@ class BookmarkEditorView : public BookmarkEditor, const EditDetails details_; // The context menu. - scoped_ptr<menus::SimpleMenuModel> context_menu_contents_; + scoped_ptr<ui::SimpleMenuModel> context_menu_contents_; scoped_ptr<views::Menu2> context_menu_; // Mode used to create nodes from. diff --git a/chrome/browser/ui/views/clear_browsing_data.h b/chrome/browser/ui/views/clear_browsing_data.h index 8b1359e..b7e2ce9 100644 --- a/chrome/browser/ui/views/clear_browsing_data.h +++ b/chrome/browser/ui/views/clear_browsing_data.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_CLEAR_BROWSING_DATA_H_ #pragma once -#include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/button/button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" @@ -35,7 +35,7 @@ class MessageLoop; class ClearBrowsingDataView : public views::View, public views::DialogDelegate, public views::ButtonListener, - public ComboboxModel, + public ui::ComboboxModel, public views::Combobox::Listener, public BrowsingDataRemover::Observer, public views::LinkController { @@ -69,7 +69,7 @@ class ClearBrowsingDataView : public views::View, virtual bool GetSizeExtraViewHeightToButtons() { return true; } virtual views::View* GetInitiallyFocusedView(); - // Overridden from ComboboxModel: + // Overridden from ui::ComboboxModel: virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/clear_browsing_data_view.h b/chrome/browser/ui/views/clear_browsing_data_view.h index 4145b7b..695382a4 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.h +++ b/chrome/browser/ui/views/clear_browsing_data_view.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_ #pragma once -#include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/ui/views/clear_data_view.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/button/button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" @@ -38,7 +38,7 @@ class MessageLoop; //////////////////////////////////////////////////////////////////////////////// class ClearBrowsingDataView2 : public views::View, public views::ButtonListener, - public ComboboxModel, + public ui::ComboboxModel, public views::Combobox::Listener, public BrowsingDataRemover::Observer, public views::LinkController { @@ -50,7 +50,7 @@ class ClearBrowsingDataView2 : public views::View, // Initialize the controls on the dialog. void Init(); - // Overridden from ComboboxModel: + // Overridden from ui::ComboboxModel: virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/clear_data_view.h b/chrome/browser/ui/views/clear_data_view.h index d7a354e..4d2f027 100644 --- a/chrome/browser/ui/views/clear_data_view.h +++ b/chrome/browser/ui/views/clear_data_view.h @@ -6,12 +6,10 @@ #define CHROME_BROWSER_UI_VIEWS_CLEAR_DATA_VIEW_H_ #pragma once -#include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/ui/views/clear_browsing_data_view.h" #include "chrome/browser/ui/views/clear_server_data.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/chrome/browser/ui/views/clear_server_data.h b/chrome/browser/ui/views/clear_server_data.h index ed3dad4..925bc54 100644 --- a/chrome/browser/ui/views/clear_server_data.h +++ b/chrome/browser/ui/views/clear_server_data.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_VIEWS_CLEAR_SERVER_DATA_H_ #pragma once -#include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/ui/views/clear_data_view.h" #include "chrome/browser/ui/views/confirm_message_box_dialog.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 889b653..b939cf5 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -339,7 +339,7 @@ void CollectedCookiesWin::OnTreeViewSelectionChanged( void CollectedCookiesWin::EnableControls() { bool enable_allowed_buttons = false; - TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode(); + ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode(); if (node) { CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node); if (cookie_node->GetDetailedInfo().node_type == diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h index 071201c..1b8d650 100644 --- a/chrome/browser/ui/views/cookie_info_view.h +++ b/chrome/browser/ui/views/cookie_info_view.h @@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "app/combobox_model.h" #include "base/string16.h" #include "net/base/cookie_monster.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/combobox/combobox.h" #include "views/view.h" @@ -40,7 +40,7 @@ class CookieInfoViewDelegate { // Responsible for displaying a tabular grid of Cookie information. class CookieInfoView : public views::View, public views::Combobox::Listener, - public ComboboxModel { + public ui::ComboboxModel { public: explicit CookieInfoView(bool editable_expiration_date); virtual ~CookieInfoView(); @@ -72,7 +72,7 @@ class CookieInfoView : public views::View, int prev_index, int new_index); - // ComboboxModel overrides for expires_value_combobox_. + // ui::ComboboxModel overrides for expires_value_combobox_. virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index 215e50c..f1eb9de 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -121,7 +121,7 @@ void BrowserFrameGtk::SetInitialFocus() { } bool BrowserFrameGtk::GetAccelerator(int cmd_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return browser_view_->GetAccelerator(cmd_id, accelerator); } diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.h b/chrome/browser/ui/views/frame/browser_frame_gtk.h index d7d0ca3..30539f5 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.h +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.h @@ -51,7 +51,7 @@ class BrowserFrameGtk : public BrowserFrame, // Overridden from views::WidgetGtk: virtual views::RootView* CreateRootView(); - virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator); + virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator); // Overriden from views::WindowGtk: virtual gboolean OnWindowStateEvent(GtkWidget* widget, diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 9fe26b6..ef58aba 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -153,7 +153,7 @@ gfx::Insets BrowserFrameWin::GetClientAreaInsets() const { } bool BrowserFrameWin::GetAccelerator(int cmd_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return browser_view_->GetAccelerator(cmd_id, accelerator); } diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index 69d14a3..d39aa7f 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -50,7 +50,7 @@ class BrowserFrameWin : public BrowserFrame, public views::WindowWin { protected: // Overridden from views::WindowWin: virtual gfx::Insets GetClientAreaInsets() const; - virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator); + virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator); virtual void OnEndSession(BOOL ending, UINT logoff); virtual void OnEnterSizeMove(); virtual void OnExitSizeMove(); diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 4ba5d41..d0aebca 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -615,7 +615,7 @@ bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { return browser_->ExecuteCommandIfEnabled(command_id); } -bool BrowserView::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) { +bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) { // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators // anywhere so we need to check for them explicitly here. switch (cmd_id) { @@ -1517,7 +1517,7 @@ void BrowserView::TabStripEmpty() { } /////////////////////////////////////////////////////////////////////////////// -// BrowserView, menus::SimpleMenuModel::Delegate implementation: +// BrowserView, ui::SimpleMenuModel::Delegate implementation: bool BrowserView::IsCommandIdChecked(int command_id) const { // TODO(beng): encoding menu. @@ -1530,7 +1530,7 @@ bool BrowserView::IsCommandIdEnabled(int command_id) const { } bool BrowserView::GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { // Let's let the ToolbarView own the canonical implementation of this method. return toolbar_->GetAcceleratorForCommandId(command_id, accelerator); } diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 1825d64a..1ee648f 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "build/build_config.h" @@ -26,6 +25,7 @@ #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/notification_registrar.h" #include "gfx/native_widget_types.h" +#include "ui/base/models/simple_menu_model.h" #include "views/controls/single_split_view.h" #include "views/window/client_view.h" #include "views/window/window_delegate.h" @@ -81,7 +81,7 @@ class BrowserView : public BrowserBubbleHost, public BrowserWindowTesting, public NotificationObserver, public TabStripModelObserver, - public menus::SimpleMenuModel::Delegate, + public ui::SimpleMenuModel::Delegate, public views::WindowDelegate, public views::ClientView, public InfoBarContainer::Delegate, @@ -178,7 +178,7 @@ class BrowserView : public BrowserBubbleHost, // command id. This can be used to provide menu item shortcut hints etc. // Returns true if an accelerator was found for the specified |cmd_id|, false // otherwise. - bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator); + bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator); // Shows the next app-modal dialog box, if there is one to be shown, or moves // an existing showing one to the front. Returns true if one was shown or @@ -360,11 +360,11 @@ class BrowserView : public BrowserBubbleHost, int index); virtual void TabStripEmpty(); - // Overridden from menus::SimpleMenuModel::Delegate: + // Overridden from ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const; virtual bool IsCommandIdEnabled(int command_id) const; virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); virtual bool IsItemForCommandIdDynamic(int command_id) const; virtual string16 GetLabelForCommandId(int command_id) const; virtual void ExecuteCommand(int command_id); diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 95184af..f6f60f5 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -50,14 +50,14 @@ class HungPagesTableModel : public views::GroupTableModel { virtual int RowCount(); virtual string16 GetText(int row, int column_id); virtual SkBitmap GetIcon(int row); - virtual void SetObserver(TableModelObserver* observer); + virtual void SetObserver(ui::TableModelObserver* observer); virtual void GetGroupRangeForItem(int item, views::GroupRange* range); private: typedef std::vector<TabContents*> TabContentsVector; TabContentsVector tab_contentses_; - TableModelObserver* observer_; + ui::TableModelObserver* observer_; DISALLOW_COPY_AND_ASSIGN(HungPagesTableModel); }; @@ -106,7 +106,7 @@ SkBitmap HungPagesTableModel::GetIcon(int row) { return tab_contentses_.at(row)->GetFavIcon(); } -void HungPagesTableModel::SetObserver(TableModelObserver* observer) { +void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) { observer_ = observer; } diff --git a/chrome/browser/ui/views/importer_view.h b/chrome/browser/ui/views/importer_view.h index 0d06485..c120dbc 100644 --- a/chrome/browser/ui/views/importer_view.h +++ b/chrome/browser/ui/views/importer_view.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_VIEWS_IMPORTER_VIEW_H_ #pragma once -#include "app/combobox_model.h" #include "base/string16.h" #include "chrome/browser/importer/importer.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/button/native_button.h" #include "views/controls/combobox/combobox.h" #include "views/view.h" @@ -29,7 +29,7 @@ class Profile; class ImporterView : public views::View, public views::DialogDelegate, public views::ButtonListener, - public ComboboxModel, + public ui::ComboboxModel, public views::Combobox::Listener, public ImporterList::Observer, public ImportObserver { @@ -56,7 +56,7 @@ class ImporterView : public views::View, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, const views::Event& event); - // ComboboxModel implementation. + // ui::ComboboxModel implementation. virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc index 9e3ec7c..9911e5d 100644 --- a/chrome/browser/ui/views/keyword_editor_view.cc +++ b/chrome/browser/ui/views/keyword_editor_view.cc @@ -153,14 +153,14 @@ views::View* KeywordEditorView::GetContentsView() { } void KeywordEditorView::Init() { - std::vector<TableColumn> columns; + std::vector<ui::TableColumn> columns; columns.push_back( - TableColumn(IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN, - TableColumn::LEFT, -1, .75)); + ui::TableColumn(IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN, + ui::TableColumn::LEFT, -1, .75)); columns.back().sortable = true; columns.push_back( - TableColumn(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN, - TableColumn::LEFT, -1, .25)); + ui::TableColumn(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN, + ui::TableColumn::LEFT, -1, .25)); columns.back().sortable = true; table_view_ = new views::TableView(controller_->table_model(), columns, views::ICON_AND_TEXT, false, true, true); diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc index 64d79f5..465593c 100644 --- a/chrome/browser/ui/views/options/cookies_view.cc +++ b/chrome/browser/ui/views/options/cookies_view.cc @@ -55,7 +55,7 @@ CookiesTreeView::CookiesTreeView(CookiesTreeModel* cookies_model) { } void CookiesTreeView::RemoveSelectedItems() { - TreeModelNode* selected_node = GetSelectedNode(); + ui::TreeModelNode* selected_node = GetSelectedNode(); if (selected_node) { static_cast<CookiesTreeModel*>(model())->DeleteCookieNode( static_cast<CookieTreeNode*>(GetSelectedNode())); @@ -108,8 +108,8 @@ CookiesView::~CookiesView() { /////////////////////////////////////////////////////////////////////////////// // CookiesView, TreeModelObserver overrides: -void CookiesView::TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, +void CookiesView::TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) { UpdateRemoveButtonsState(); diff --git a/chrome/browser/ui/views/options/cookies_view.h b/chrome/browser/ui/views/options/cookies_view.h index fbc8821..0b05fc1 100644 --- a/chrome/browser/ui/views/options/cookies_view.h +++ b/chrome/browser/ui/views/options/cookies_view.h @@ -18,14 +18,6 @@ #include "views/window/dialog_delegate.h" #include "views/window/window.h" -namespace views { - -class Label; -class NativeButton; - -} // namespace views - - class AppCacheInfoView; class CookieInfoView; class CookiesTreeView; @@ -34,9 +26,16 @@ class IndexedDBInfoView; class LocalStorageInfoView; class Profile; class Timer; + +namespace ui { class TreeModel; class TreeModelNode; +} // namespace ui +namespace views { +class Label; +class NativeButton; +} // namespace views class CookiesView : public CookiesTreeModel::Observer, public views::View, @@ -54,15 +53,15 @@ class CookiesView : public CookiesTreeModel::Observer, void UpdateSearchResults(); // Begin TreeModelObserver implementation. - virtual void TreeNodesAdded(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesAdded(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count); - virtual void TreeNodesRemoved(TreeModel* model, - TreeModelNode* parent, + virtual void TreeNodesRemoved(ui::TreeModel* model, + ui::TreeModelNode* parent, int start, int count) {} - virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node) {} + virtual void TreeNodeChanged(ui::TreeModel* model, ui::TreeModelNode* node) {} // End TreeModelObserver implementation. // views::ButtonListener implementation. diff --git a/chrome/browser/ui/views/options/exceptions_page_view.cc b/chrome/browser/ui/views/options/exceptions_page_view.cc index fd94c06..7d2c71f 100644 --- a/chrome/browser/ui/views/options/exceptions_page_view.cc +++ b/chrome/browser/ui/views/options/exceptions_page_view.cc @@ -182,9 +182,9 @@ void ExceptionsPageView::SetupTable() { // Creates the different columns for the table. // The float resize values are the result of much tinkering. - std::vector<TableColumn> columns; - columns.push_back(TableColumn(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN, - TableColumn::LEFT, -1, 0.55f)); + std::vector<ui::TableColumn> columns; + columns.push_back(ui::TableColumn(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN, + ui::TableColumn::LEFT, -1, 0.55f)); columns.back().sortable = true; table_view_ = new views::TableView(&table_model_, columns, views::TEXT_ONLY, true, true, true); diff --git a/chrome/browser/ui/views/options/exceptions_view.cc b/chrome/browser/ui/views/options/exceptions_view.cc index 73f1b7b..219205c 100644 --- a/chrome/browser/ui/views/options/exceptions_view.cc +++ b/chrome/browser/ui/views/options/exceptions_view.cc @@ -164,12 +164,14 @@ void ExceptionsView::Init() { using views::GridLayout; - std::vector<TableColumn> columns; + std::vector<ui::TableColumn> columns; columns.push_back( - TableColumn(IDS_EXCEPTIONS_PATTERN_HEADER, TableColumn::LEFT, -1, .75)); + ui::TableColumn(IDS_EXCEPTIONS_PATTERN_HEADER, ui::TableColumn::LEFT, -1, + .75)); columns.back().sortable = true; columns.push_back( - TableColumn(IDS_EXCEPTIONS_ACTION_HEADER, TableColumn::LEFT, -1, .25)); + ui::TableColumn(IDS_EXCEPTIONS_ACTION_HEADER, ui::TableColumn::LEFT, -1, + .25)); columns.back().sortable = true; table_ = new ContentExceptionsTableView(&model_, columns); views::TableView::SortDescriptors sort; diff --git a/chrome/browser/ui/views/options/fonts_page_view.h b/chrome/browser/ui/views/options/fonts_page_view.h index 83e4b8a..02db748 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.h +++ b/chrome/browser/ui/views/options/fonts_page_view.h @@ -15,6 +15,9 @@ #include "views/controls/button/button.h" #include "views/view.h" +class DefaultEncodingComboboxModel; +class FontDisplayView; + namespace views { class GroupboxView; class Label; @@ -22,10 +25,6 @@ class NativeButton; class TableView; } -class DefaultEncodingComboboxModel; -class FontDisplayView; -class TableModel; - /////////////////////////////////////////////////////////////////////////////// // FontsPageView diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index 2f4c56d..d32b19b 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/callback.h" #include "base/message_loop.h" @@ -36,6 +35,7 @@ #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" @@ -76,7 +76,7 @@ class OptionsGroupContents : public views::View { /////////////////////////////////////////////////////////////////////////////// // SearchEngineListModel -class SearchEngineListModel : public ComboboxModel, +class SearchEngineListModel : public ui::ComboboxModel, public TemplateURLModelObserver { public: explicit SearchEngineListModel(Profile* profile); @@ -86,7 +86,7 @@ class SearchEngineListModel : public ComboboxModel, // so that when the TemplateURLModel changes the combobox can be updated. void SetCombobox(views::Combobox* combobox); - // ComboboxModel overrides: + // ui::ComboboxModel overrides: virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/options/general_page_view.h b/chrome/browser/ui/views/options/general_page_view.h index 3093d53..43ab638 100644 --- a/chrome/browser/ui/views/options/general_page_view.h +++ b/chrome/browser/ui/views/options/general_page_view.h @@ -17,6 +17,10 @@ #include "views/controls/table/table_view_observer.h" #include "views/view.h" +class CustomHomePagesTableModel; +class OptionsGroupView; +class SearchEngineListModel; + namespace views { class Checkbox; class GroupboxView; @@ -26,10 +30,6 @@ class RadioButton; class TableView; class Textfield; } -class CustomHomePagesTableModel; -class OptionsGroupView; -class SearchEngineListModel; -class TableModel; /////////////////////////////////////////////////////////////////////////////// // GeneralPageView diff --git a/chrome/browser/ui/views/options/languages_page_view.h b/chrome/browser/ui/views/options/languages_page_view.h index 57feff5..1babef7 100644 --- a/chrome/browser/ui/views/options/languages_page_view.h +++ b/chrome/browser/ui/views/options/languages_page_view.h @@ -13,6 +13,10 @@ #include "views/controls/table/table_view_observer.h" #include "views/view.h" +class AddLanguageView; +class LanguageComboboxModel; +class LanguageOrderTableModel; + namespace views { class Checkbox; class Label; @@ -20,11 +24,6 @@ class NativeButton; class TableView; } -class AddLanguageView; -class LanguageComboboxModel; -class LanguageOrderTableModel; -class TableModel; - /////////////////////////////////////////////////////////////////////////////// // LanguagesPageView diff --git a/chrome/browser/ui/views/options/passwords_page_view.cc b/chrome/browser/ui/views/options/passwords_page_view.cc index 8b4ea5b..19cab6d 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.cc +++ b/chrome/browser/ui/views/options/passwords_page_view.cc @@ -99,7 +99,7 @@ int PasswordsTableModel::CompareValues(int row1, int row2, return TableModel::CompareValues(row1, row2, column_id); } -void PasswordsTableModel::SetObserver(TableModelObserver* observer) { +void PasswordsTableModel::SetObserver(ui::TableModelObserver* observer) { observer_ = observer; } @@ -333,12 +333,12 @@ void PasswordsPageView::SetupTable() { // Creates the different columns for the table. // The float resize values are the result of much tinkering. - std::vector<TableColumn> columns; - columns.push_back(TableColumn(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN, - TableColumn::LEFT, -1, 0.55f)); + std::vector<ui::TableColumn> columns; + columns.push_back(ui::TableColumn(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN, + ui::TableColumn::LEFT, -1, 0.55f)); columns.back().sortable = true; - columns.push_back(TableColumn( - IDS_PASSWORDS_PAGE_VIEW_USERNAME_COLUMN, TableColumn::LEFT, + columns.push_back(ui::TableColumn( + IDS_PASSWORDS_PAGE_VIEW_USERNAME_COLUMN, ui::TableColumn::LEFT, -1, 0.37f)); columns.back().sortable = true; table_view_ = new views::TableView(&table_model_, columns, views::TEXT_ONLY, diff --git a/chrome/browser/ui/views/options/passwords_page_view.h b/chrome/browser/ui/views/options/passwords_page_view.h index e5f7a26..36f0d3c 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.h +++ b/chrome/browser/ui/views/options/passwords_page_view.h @@ -8,7 +8,6 @@ #include <vector> -#include "app/table_model.h" #include "app/text_elider.h" #include "base/compiler_specific.h" #include "base/scoped_ptr.h" @@ -18,6 +17,7 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/ui/views/confirm_message_box_dialog.h" #include "chrome/browser/ui/views/options/options_page_view.h" +#include "ui/base/models/table_model.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" @@ -73,7 +73,7 @@ class PasswordsTableModel : public TableModel, virtual int RowCount() OVERRIDE; virtual string16 GetText(int row, int column) OVERRIDE; virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE; - virtual void SetObserver(TableModelObserver* observer) OVERRIDE; + virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; // Delete the PasswordForm at specified row from the database (and remove // from view). @@ -120,7 +120,7 @@ class PasswordsTableModel : public TableModel, } // The TableView observing this model. - TableModelObserver* observer_; + ui::TableModelObserver* observer_; // Dispatching row count events specific to this password manager table model // to this observer. diff --git a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc index c5002ab..695686f 100644 --- a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc +++ b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc @@ -116,12 +116,14 @@ void SimpleContentExceptionsView::Init() { using views::GridLayout; - std::vector<TableColumn> columns; + std::vector<ui::TableColumn> columns; columns.push_back( - TableColumn(IDS_EXCEPTIONS_HOSTNAME_HEADER, TableColumn::LEFT, -1, .75)); + ui::TableColumn(IDS_EXCEPTIONS_HOSTNAME_HEADER, ui::TableColumn::LEFT, -1, + .75)); columns.back().sortable = true; columns.push_back( - TableColumn(IDS_EXCEPTIONS_ACTION_HEADER, TableColumn::LEFT, -1, .25)); + ui::TableColumn(IDS_EXCEPTIONS_ACTION_HEADER, ui::TableColumn::LEFT, -1, + .25)); columns.back().sortable = true; table_ = new views::TableView(model_.get(), columns, views::TEXT_ONLY, false, true, false); diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc index d4572e4..c9b4f8c 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc @@ -61,7 +61,7 @@ void StatusIconWin::InitIconData(NOTIFYICONDATA* icon_data) { icon_data->uID = icon_id_; } -void StatusIconWin::UpdatePlatformContextMenu(menus::MenuModel* menu) { +void StatusIconWin::UpdatePlatformContextMenu(ui::MenuModel* menu) { // If no items are passed, blow away our context menu. if (!menu) { context_menu_.reset(); diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h index 6bbda23..e353023 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.h +++ b/chrome/browser/ui/views/status_icons/status_icon_win.h @@ -39,7 +39,7 @@ class StatusIconWin : public StatusIcon { protected: // Overridden from StatusIcon. - virtual void UpdatePlatformContextMenu(menus::MenuModel* menu); + virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); private: void InitIconData(NOTIFYICONDATA* icon_data); diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index 5f61c45..4c44a8f 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -12,6 +11,7 @@ #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/models/simple_menu_model.h" class SkBitmap; @@ -35,7 +35,7 @@ TEST(StatusTrayWinTest, CreateIconAndMenu) { icon->SetImage(*bitmap); icon->SetPressedImage(*bitmap); icon->SetToolTip(ASCIIToUTF16("tool tip")); - menus::SimpleMenuModel* menu = new menus::SimpleMenuModel(NULL); + ui::SimpleMenuModel* menu = new ui::SimpleMenuModel(NULL); menu->AddItem(0, L"foo"); icon->SetContextMenu(menu); } diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc index 42a05e9..bedf718 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc @@ -62,7 +62,7 @@ void RenderViewContextMenuViews::PlatformInit() { bool RenderViewContextMenuViews::GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accel) { + ui::Accelerator* accel) { // There are no formally defined accelerators we can query so we assume // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. switch (command_id) { diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h index 266e762..af13bd0 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h @@ -36,7 +36,7 @@ class RenderViewContextMenuViews : public RenderViewContextMenu { // RenderViewContextMenu implementation -------------------------------------- virtual void PlatformInit(); virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); private: // The context menu itself and its contents. scoped_ptr<views::Menu2> menu_; diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 5389ec8..07ab52b 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -31,7 +31,7 @@ static TabRendererData::NetworkState TabContentsNetworkState( } class BrowserTabStripController::TabContextMenuContents - : public menus::SimpleMenuModel::Delegate { + : public ui::SimpleMenuModel::Delegate { public: TabContextMenuContents(BaseTab* tab, BrowserTabStripController* controller) @@ -57,7 +57,7 @@ class BrowserTabStripController::TabContextMenuContents // We could be gone now. Assume |this| is junk! } - // Overridden from menus::SimpleMenuModel::Delegate: + // Overridden from ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const { return controller_->IsCommandCheckedForTab( static_cast<TabStripModel::ContextMenuCommand>(command_id), @@ -70,7 +70,7 @@ class BrowserTabStripController::TabContextMenuContents } virtual bool GetAcceleratorForCommandId( int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { int browser_cmd; return TabStripModel::ContextMenuCommandToBrowserCommand(command_id, &browser_cmd) ? diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index e12dd20..568301e 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/task_manager/task_manager.h" #include "app/l10n_util.h" -#include "app/table_model_observer.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/metrics/stats_table.h" @@ -22,6 +21,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/models/table_model_observer.h" #include "views/accelerator.h" #include "views/background.h" #include "views/controls/button/native_button.h" @@ -62,7 +62,7 @@ class TaskManagerTableModel : public views::GroupTableModel, string16 GetText(int row, int column) OVERRIDE; SkBitmap GetIcon(int row) OVERRIDE; void GetGroupRangeForItem(int item, views::GroupRange* range) OVERRIDE; - void SetObserver(TableModelObserver* observer) OVERRIDE; + void SetObserver(ui::TableModelObserver* observer) OVERRIDE; virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE; // TaskManagerModelObserver. @@ -73,7 +73,7 @@ class TaskManagerTableModel : public views::GroupTableModel, private: TaskManagerModel* model_; - TableModelObserver* observer_; + ui::TableModelObserver* observer_; }; int TaskManagerTableModel::RowCount() { @@ -159,7 +159,7 @@ void TaskManagerTableModel::GetGroupRangeForItem(int item, range->length = range_pair.second; } -void TaskManagerTableModel::SetObserver(TableModelObserver* observer) { +void TaskManagerTableModel::SetObserver(ui::TableModelObserver* observer) { observer_ = observer; } @@ -275,7 +275,7 @@ class TaskManagerView : public views::View, TaskManagerModel* model_; // all possible columns, not necessarily visible - std::vector<TableColumn> columns_; + std::vector<ui::TableColumn> columns_; scoped_ptr<TaskManagerTableModel> table_model_; @@ -313,42 +313,44 @@ void TaskManagerView::Init() { table_model_.reset(new TaskManagerTableModel(model_)); // Page column has no header label. - columns_.push_back(TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN, - TableColumn::LEFT, -1, 1)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN, + ui::TableColumn::LEFT, -1, 1)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_CPU_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_CPU_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_NET_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_NET_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn( + IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn( + IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; - columns_.push_back(TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, - TableColumn::RIGHT, -1, 0)); + columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; columns_.push_back( - TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, - TableColumn::RIGHT, -1, 0)); + ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, + ui::TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; tab_table_ = new views::GroupTableView(table_model_.get(), columns_, @@ -408,7 +410,8 @@ void TaskManagerView::UpdateStatsCounters() { // stat names not in the string table would be filtered out. // TODO(erikkay): Width is hard-coded right now, so many column // names are clipped. - TableColumn col(i, ASCIIToUTF16(row), TableColumn::RIGHT, 90, 0); + ui::TableColumn col(i, ASCIIToUTF16(row), ui::TableColumn::RIGHT, 90, + 0); col.sortable = true; columns_.push_back(col); tab_table_->AddColumn(col); @@ -617,7 +620,7 @@ void TaskManagerView::ShowContextMenu(views::View* source, UpdateStatsCounters(); scoped_ptr<views::Menu> menu(views::Menu::Create( this, views::Menu::TOPLEFT, source->GetWidget()->GetNativeView())); - for (std::vector<TableColumn>::iterator i = + for (std::vector<ui::TableColumn>::iterator i = columns_.begin(); i != columns_.end(); ++i) { menu->AppendMenuItem(i->id, l10n_util::GetStringUTF16(i->id), views::Menu::CHECKBOX); diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 38ab6e5..4545630 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -323,7 +323,7 @@ AccessibilityTypes::Role ToolbarView::GetAccessibleRole() { //////////////////////////////////////////////////////////////////////////////// // ToolbarView, Menu::BaseControllerDelegate overrides: -bool ToolbarView::GetAcceleratorInfo(int id, menus::Accelerator* accel) { +bool ToolbarView::GetAcceleratorInfo(int id, ui::Accelerator* accel) { return GetWidget()->GetAccelerator(id, accel); } @@ -451,10 +451,10 @@ void ToolbarView::Observe(NotificationType type, } //////////////////////////////////////////////////////////////////////////////// -// ToolbarView, menus::AcceleratorProvider implementation: +// ToolbarView, ui::AcceleratorProvider implementation: bool ToolbarView::GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator) { + ui::Accelerator* accelerator) { // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators // anywhere so we need to check for them explicitly here. // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings. diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index 8c07dc2..4d2f1c6 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -8,7 +8,6 @@ #include <vector> -#include "app/menus/accelerator.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "chrome/browser/command_updater.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/reload_button.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/models/accelerator.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu.h" #include "views/controls/menu/menu_wrapper.h" @@ -37,7 +37,7 @@ class WrenchMenu; // The Browser Window's toolbar. class ToolbarView : public AccessiblePaneView, public views::ViewMenuDelegate, - public menus::AcceleratorProvider, + public ui::AcceleratorProvider, public LocationBarView::Delegate, public NotificationObserver, public CommandUpdater::CommandObserver, @@ -90,7 +90,7 @@ class ToolbarView : public AccessiblePaneView, virtual AccessibilityTypes::Role GetAccessibleRole(); // Overridden from Menu::BaseControllerDelegate: - virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel); + virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel); // Overridden from views::MenuDelegate: virtual void RunMenu(views::View* source, const gfx::Point& pt); @@ -111,9 +111,9 @@ class ToolbarView : public AccessiblePaneView, const NotificationSource& source, const NotificationDetails& details); - // Overridden from menus::AcceleratorProvider: + // Overridden from ui::AcceleratorProvider: virtual bool GetAcceleratorForCommandId(int command_id, - menus::Accelerator* accelerator); + ui::Accelerator* accelerator); // Overridden from views::View: virtual gfx::Size GetPreferredSize(); @@ -192,7 +192,7 @@ class ToolbarView : public AccessiblePaneView, Browser* browser_; // Contents of the profiles menu to populate with profile names. - scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_; + scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_; // Controls whether or not a home button should be shown on the toolbar. BooleanPrefMember show_home_button_; @@ -201,7 +201,7 @@ class ToolbarView : public AccessiblePaneView, DisplayMode display_mode_; // The contents of the wrench menu. - scoped_ptr<menus::SimpleMenuModel> wrench_menu_model_; + scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_; #if defined(OS_CHROMEOS) // Wrench menu using domui menu. diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index 23aad8c..3f29582 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_ #pragma once -#include "app/combobox_model.h" #include "base/string16.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/combobox/combobox.h" #include "views/window/dialog_delegate.h" @@ -22,7 +22,7 @@ class Label; class UninstallView : public views::View, public views::ButtonListener, public views::DialogDelegate, - public ComboboxModel { + public ui::ComboboxModel { public: explicit UninstallView(int& user_selection); virtual ~UninstallView(); @@ -40,7 +40,7 @@ class UninstallView : public views::View, virtual std::wstring GetWindowTitle() const; virtual views::View* GetContentsView(); - // Overridden from views::Combobox::Model. + // Overridden from ui::ComboboxModel. virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index b7bfd0e..fe6354d 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/table_model.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "grit/locale_settings.h" #include "net/base/net_util.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/table_model.h" #include "views/background.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" @@ -52,13 +52,11 @@ UrlPicker::UrlPicker(UrlPickerDelegate* delegate, url_table_model_.reset(new PossibleURLModel()); - TableColumn col1(IDS_ASI_PAGE_COLUMN, TableColumn::LEFT, -1, - 50); + ui::TableColumn col1(IDS_ASI_PAGE_COLUMN, ui::TableColumn::LEFT, -1, 50); col1.sortable = true; - TableColumn col2(IDS_ASI_URL_COLUMN, TableColumn::LEFT, -1, - 50); + ui::TableColumn col2(IDS_ASI_URL_COLUMN, TableColumn::LEFT, -1, 50); col2.sortable = true; - std::vector<TableColumn> cols; + std::vector<ui::TableColumn> cols; cols.push_back(col1); cols.push_back(col2); diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 9eb85c4..37b34d5 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -37,7 +37,7 @@ #include "views/controls/menu/submenu_view.h" #include "views/window/window.h" -using menus::MenuModel; +using ui::MenuModel; using views::CustomButton; using views::ImageButton; using views::Label; @@ -250,7 +250,7 @@ string16 GetAccessibleNameForWrenchMenuItem( string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id); string16 accelerator_text; - menus::Accelerator menu_accelerator; + ui::Accelerator menu_accelerator; if (model->GetAcceleratorAt(item_index, &menu_accelerator)) { accelerator_text = views::Accelerator(menu_accelerator.GetKeyCode(), @@ -569,7 +569,7 @@ WrenchMenu::WrenchMenu(Browser* browser) selected_index_(0) { } -void WrenchMenu::Init(menus::MenuModel* model) { +void WrenchMenu::Init(ui::MenuModel* model) { DCHECK(!root_.get()); root_.reset(new MenuItemView(this)); root_->SetAccessibleName( @@ -637,7 +637,7 @@ bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) { return false; } - menus::Accelerator menu_accelerator; + ui::Accelerator menu_accelerator; if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator)) return false; diff --git a/chrome/browser/ui/views/wrench_menu.h b/chrome/browser/ui/views/wrench_menu.h index 6efaaa8..f77e67d 100644 --- a/chrome/browser/ui/views/wrench_menu.h +++ b/chrome/browser/ui/views/wrench_menu.h @@ -9,9 +9,9 @@ #include <map> #include <utility> -#include "app/menus/menu_model.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "ui/base/models/menu_model.h" #include "views/controls/menu/menu_delegate.h" class Browser; @@ -28,7 +28,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, public: explicit WrenchMenu(Browser* browser); - void Init(menus::MenuModel* model); + void Init(ui::MenuModel* model); // Shows the menu relative to the specified view. void RunMenu(views::MenuButton* host); @@ -45,7 +45,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, class CutCopyPasteView; class ZoomView; - typedef std::pair<menus::MenuModel*,int> Entry; + typedef std::pair<ui::MenuModel*,int> Entry; typedef std::map<int,Entry> IDToEntry; ~WrenchMenu(); @@ -54,20 +54,20 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, // |PopulateMenu| for any submenu. |next_id| is incremented for every menu // that is created. void PopulateMenu(views::MenuItemView* parent, - menus::MenuModel* model, + ui::MenuModel* model, int* next_id); // Adds a new menu to |parent| to represent the MenuModel/index pair passed // in. views::MenuItemView* AppendMenuItem(views::MenuItemView* parent, - menus::MenuModel* model, + ui::MenuModel* model, int index, - menus::MenuModel::ItemType menu_type, + ui::MenuModel::ItemType menu_type, int* next_id); // Invoked from the cut/copy/paste menus. Cancels the current active menu and // activates the menu item in |model| at |index|. - void CancelAndEvaluate(menus::MenuModel* model, int index); + void CancelAndEvaluate(ui::MenuModel* model, int index); // The views menu. scoped_ptr<views::MenuItemView> root_; @@ -83,7 +83,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, // If |selected_menu_model_| is non-null after the menu completes // ActivatedAt is invoked. This is done so that ActivatedAt isn't invoked // while the message loop is nested. - menus::MenuModel* selected_menu_model_; + ui::MenuModel* selected_menu_model_; int selected_index_; DISALLOW_COPY_AND_ASSIGN(WrenchMenu); |