diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 01:22:46 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 01:22:46 +0000 |
| commit | 4b392ef1066efa731dc564245228fc210d213b2f (patch) | |
| tree | 6cac0cffbd92b05bd4b4cfe596755deaf958beee /chrome/browser/views/options/advanced_contents_view.h | |
| parent | 799c948c822e04651c049e364145dc16e3a7135b (diff) | |
| download | chromium_src-4b392ef1066efa731dc564245228fc210d213b2f.zip chromium_src-4b392ef1066efa731dc564245228fc210d213b2f.tar.gz chromium_src-4b392ef1066efa731dc564245228fc210d213b2f.tar.bz2 | |
Introduce FilePathPrefMember so we can get rid of some FromWString conversions.
BUG=24672
TEST=download a file and verify that works as before.
Patch from Thiago Farina <thiago.farina@gmail.com>
Review URL: http://codereview.chromium.org/1646015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/advanced_contents_view.h')
| -rw-r--r-- | chrome/browser/views/options/advanced_contents_view.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.h b/chrome/browser/views/options/advanced_contents_view.h index a2cbfa5..a27acb9 100644 --- a/chrome/browser/views/options/advanced_contents_view.h +++ b/chrome/browser/views/options/advanced_contents_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. @@ -32,7 +32,7 @@ class AdvancedScrollViewContainer : public views::View { // The scroll view that contains the advanced options. views::ScrollView* scroll_view_; - DISALLOW_EVIL_CONSTRUCTORS(AdvancedScrollViewContainer); + DISALLOW_COPY_AND_ASSIGN(AdvancedScrollViewContainer); }; #endif // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H__ |