diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 20:55:12 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 20:55:12 +0000 |
| commit | f67500902a8fefd798915e0d257b342f16b10133 (patch) | |
| tree | dc85102d1141c5a98d99b186c9cd79185a93d35d /chrome/browser/views/first_run_view.h | |
| parent | a95783431c8cbc99981692cc0978af95cb3777af (diff) | |
| download | chromium_src-f67500902a8fefd798915e0d257b342f16b10133.zip chromium_src-f67500902a8fefd798915e0d257b342f16b10133.tar.gz chromium_src-f67500902a8fefd798915e0d257b342f16b10133.tar.bz2 | |
"Make Chrome your default browser" should now appear as a checkbox at the bottom of the First Run dialogs and be opt-out. Therefore I moved it from the FirstRunCustomizeView view to the FirstRunViewBase.
I also moved the override function for GetDialogButtonLabel to the base class (since both dialogs should have the same label for the OK button) and aligned the "Import" label vertically to the "Import" combobox.
Review URL: http://codereview.chromium.org/4244
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/first_run_view.h')
| -rw-r--r-- | chrome/browser/views/first_run_view.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h index d078248..87b0152 100644 --- a/chrome/browser/views/first_run_view.h +++ b/chrome/browser/views/first_run_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H__ -#define CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H__ +#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H_ +#define CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H_ #include "chrome/browser/views/first_run_view_base.h" #include "chrome/browser/views/first_run_customize_view.h" @@ -12,10 +12,8 @@ #include "chrome/views/view.h" namespace ChromeViews { - class Label; class Window; - } class Profile; @@ -35,7 +33,6 @@ class FirstRunView : public FirstRunViewBase, virtual void Layout(); // Overridden from ChromeViews::DialogDelegate: - virtual std::wstring GetDialogButtonLabel(DialogButton button) const; virtual bool Accept(); virtual bool Cancel(); @@ -64,8 +61,7 @@ class FirstRunView : public FirstRunViewBase, ChromeViews::Link* customize_link_; bool customize_selected_; - DISALLOW_EVIL_CONSTRUCTORS(FirstRunView); + DISALLOW_COPY_AND_ASSIGN(FirstRunView); }; -#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H__ - +#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_H_ |