diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
| commit | 00ffe5dd99527a0cb1035af6749417f5fb1c134e (patch) | |
| tree | 4354d5b35be202204d9392417862b423ba374ce0 /chrome/browser/views/options/content_page_view.cc | |
| parent | 65f73a3a996bdbaa167e38704df092aa39b53d3a (diff) | |
| download | chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.zip chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.gz chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.bz2 | |
Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!
TBR=sky
Review URL: http://codereview.chromium.org/113351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/content_page_view.cc')
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index ef822ee12..abd1d9b 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/content_page_view.h" - #include <windows.h> #include <shlobj.h> #include <vsstyle.h> #include <vssym32.h> +#include "chrome/browser/views/options/content_page_view.h" + #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -176,8 +176,7 @@ ContentPageView::ContentPageView(Profile* profile) download_default_download_location_display_(NULL), download_browse_button_(NULL), download_ask_for_save_location_checkbox_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST( - select_file_dialog_(SelectFileDialog::Create(this))), + select_file_dialog_(SelectFileDialog::Create(this)), passwords_exceptions_button_(NULL), passwords_group_(NULL), passwords_asktosave_radio_(NULL), |