diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
| commit | 44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch) | |
| tree | a997fb0565558d63e0eab62b631ef984de3e9596 /chrome/test/menu_model_test.cc | |
| parent | 0c1c047d641a599ffffa280ab50d564cedb3e436 (diff) | |
| download | chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.zip chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.gz chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.bz2 | |
Move models from app to ui/base/models
BUG=none
TEST=none
TBR=brettw
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/menu_model_test.cc')
| -rw-r--r-- | chrome/test/menu_model_test.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/test/menu_model_test.cc b/chrome/test/menu_model_test.cc index 2ea2d0d..2d4e072 100644 --- a/chrome/test/menu_model_test.cc +++ b/chrome/test/menu_model_test.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #include "chrome/test/menu_model_test.h" #include "testing/gtest/include/gtest/gtest.h" @@ -8,19 +8,19 @@ // Recursively checks the enabled state and executes a command on every item // that's not a separator or a submenu parent item. The returned count should // match the number of times the delegate is called to ensure every item works. -void MenuModelTest::CountEnabledExecutable(menus::MenuModel* model, +void MenuModelTest::CountEnabledExecutable(ui::MenuModel* model, int* count) { for (int i = 0; i < model->GetItemCount(); ++i) { - menus::MenuModel::ItemType type = model->GetTypeAt(i); + ui::MenuModel::ItemType type = model->GetTypeAt(i); switch (type) { - case menus::MenuModel::TYPE_SEPARATOR: + case ui::MenuModel::TYPE_SEPARATOR: continue; - case menus::MenuModel::TYPE_SUBMENU: + case ui::MenuModel::TYPE_SUBMENU: CountEnabledExecutable(model->GetSubmenuModelAt(i), count); break; - case menus::MenuModel::TYPE_COMMAND: - case menus::MenuModel::TYPE_CHECK: - case menus::MenuModel::TYPE_RADIO: + case ui::MenuModel::TYPE_COMMAND: + case ui::MenuModel::TYPE_CHECK: + case ui::MenuModel::TYPE_RADIO: model->IsEnabledAt(i); // Check if it's enabled (ignore answer). model->ActivatedAt(i); // Execute it. (*count)++; // Increment the count of executable items seen. |