| Index: chrome/browser/gtk/accelerators_gtk.h
|
| diff --git a/chrome/browser/gtk/accelerators_gtk.h b/chrome/browser/gtk/accelerators_gtk.h
|
| index 2e4570036bc10219e5032061686d3aa4a392fa54..f42f3ec3437f744183199858e51f4d390789ebb9 100644
|
| --- a/chrome/browser/gtk/accelerators_gtk.h
|
| +++ b/chrome/browser/gtk/accelerators_gtk.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -6,40 +6,7 @@
|
| #define CHROME_BROWSER_GTK_ACCELERATORS_GTK_H_
|
| #pragma once
|
|
|
| -#include "app/menus/accelerator_gtk.h"
|
| -#include "base/hash_tables.h"
|
| -
|
| -template <typename T> struct DefaultSingletonTraits;
|
| -
|
| -class AcceleratorsGtk {
|
| - public:
|
| - typedef std::vector<std::pair<int, menus::AcceleratorGtk> >
|
| - AcceleratorGtkList;
|
| - typedef AcceleratorGtkList::const_iterator const_iterator;
|
| -
|
| - // Returns the singleton instance.
|
| - static AcceleratorsGtk* GetInstance();
|
| -
|
| - const_iterator const begin() {
|
| - return all_accelerators_.begin();
|
| - }
|
| -
|
| - const_iterator const end() {
|
| - return all_accelerators_.end();
|
| - }
|
| -
|
| - // Returns NULL if there is no accelerator for the command.
|
| - const menus::AcceleratorGtk* GetPrimaryAcceleratorForCommand(int command_id);
|
| -
|
| - private:
|
| - friend struct DefaultSingletonTraits<AcceleratorsGtk>;
|
| -
|
| - AcceleratorsGtk();
|
| - ~AcceleratorsGtk();
|
| -
|
| - base::hash_map<int, menus::AcceleratorGtk> primary_accelerators_;
|
| -
|
| - AcceleratorGtkList all_accelerators_;
|
| -};
|
| +#include "chrome/browser/ui/gtk/accelerators_gtk.h"
|
| +// TODO(msw): remove this file once all includes have been updated.
|
|
|
| #endif // CHROME_BROWSER_GTK_ACCELERATORS_GTK_H_
|
|
|