Revert 76952 - Retry profile menu model change and clang fixes.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6632003

TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/6624029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76959 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 93 deletions

diff --git a/chrome/browser/profiles/profile_menu_model.cc b/chrome/browser/profiles/profile_menu_model.cc
deleted file mode 100644
index 5baacc1..0000000
--- a/chrome/browser/profiles/profile_menu_model.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/profiles/profile_menu_model.h"
-
-#include "grit/generated_resources.h"
-#include "views/controls/menu/menu_2.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/accelerator.h"
-#include "ui/base/models/simple_menu_model.h"
-
-ProfileMenuModel::ProfileMenuModel()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)) {
-  AddItem(0, l10n_util::GetStringUTF16(
-      IDS_PROFILES_CREATE_NEW_PROFILE_OPTION));
-  menu_.reset(new views::Menu2(this));
-}
-
-ProfileMenuModel::~ProfileMenuModel() {
-}
-
-void ProfileMenuModel::RunMenuAt(const gfx::Point& point) {
-  menu_->RunMenuAt(point, views::Menu2::ALIGN_TOPRIGHT);
-}
-
-bool ProfileMenuModel::IsCommandIdChecked(int command_id) const {
-  return false;
-}
-
-bool ProfileMenuModel::IsCommandIdEnabled(int command_id) const {
-  return false;
-}
-
-bool ProfileMenuModel::GetAcceleratorForCommandId(int command_id,
-    ui::Accelerator* accelerator) {
-  return false;
-}
-
-void ProfileMenuModel::ExecuteCommand(int command_id) {
-  NOTIMPLEMENTED();
-}
-
diff --git a/chrome/browser/profiles/profile_menu_model.h b/chrome/browser/profiles/profile_menu_model.h
deleted file mode 100644
index c168004..0000000
--- a/chrome/browser/profiles/profile_menu_model.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_PROFILES_PROFILE_MENU_MODEL_H_
-#define CHROME_BROWSER_PROFILES_PROFILE_MENU_MODEL_H_
-#pragma once
-
-#include "ui/base/models/simple_menu_model.h"
-#include "ui/gfx/point.h"
-
-namespace ui {
-class Accelerator;
-}
-
-namespace views {
-class Menu2;
-}
-
-// ProfileMenuModel
-//
-// Menu for the multi-profile button displayed on the browser frame when the
-// user is in a multi-profile-enabled account. Stub for now. TODO(mirandac):
-// enable and fill in as part of multi-profile work.
-
-class ProfileMenuModel : public ui::SimpleMenuModel,
-                         public ui::SimpleMenuModel::Delegate {
- public:
-  ProfileMenuModel();
-  virtual ~ProfileMenuModel();
-
-  void RunMenuAt(const gfx::Point& point);
-
-  // ui::SimpleMenuModel::Delegate implementation
-  virtual bool IsCommandIdChecked(int command_id) const;
-  virtual bool IsCommandIdEnabled(int command_id) const;
-  virtual bool GetAcceleratorForCommandId(int command_id,
-                                          ui::Accelerator* accelerator);
-  virtual void ExecuteCommand(int command_id);
-
- private:
-  scoped_ptr<views::Menu2> menu_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileMenuModel);
-};
-
-#endif  // CHROME_BROWSER_PROFILES_PROFILE_MENU_MODEL_H_
-
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7fde458..a5a2c12 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1666,8 +1666,6 @@
         'browser/profiles/profile_io_data.h',
         'browser/profiles/profile_manager.cc',
         'browser/profiles/profile_manager.h',
-        'browser/profiles/profile_menu_model.cc',
-        'browser/profiles/profile_menu_model.h',
         'browser/remoting/directory_add_request.cc',
         'browser/remoting/directory_add_request.h',
         'browser/remoting/remoting_options_handler.cc',