Merge 38516 - Prevent the user from triggering multiple copies of a particula...

chrome/browser/views/options/exceptions_view.h

 // Copyright (c) 2010 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_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_
 
 #include <string>
 
 #include "chrome/browser/views/options/content_exceptions_table_model.h"
@@ skipping 20 matching lines @@
 // for a specific type. ExceptionsView is deleted when the window closes.
 class ExceptionsView : public ExceptionEditorView::Delegate,
                        public views::View,
                        public views::ButtonListener,
                        public views::DialogDelegate,
                        public views::TableViewObserver {
  public:
   // Shows the Exceptions window.
   static void ShowExceptionsWindow(gfx::NativeWindow parent,
                                    HostContentSettingsMap* map,
-                                   ContentSettingsType type);
+                                   ContentSettingsType content_type);
 
   virtual ~ExceptionsView();
 
   // TableViewObserver overrides:
   virtual void OnSelectionChanged();
   virtual void OnDoubleClick();
   virtual void OnTableViewDelete(views::TableView* table_view);
 
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
@@ skipping 47 matching lines @@
   views::NativeButton* add_button_;
   views::NativeButton* edit_button_;
   views::NativeButton* remove_button_;
   views::NativeButton* remove_all_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ExceptionsView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_