chrome/browser/ui/views/download/download_in_progress_dialog_view.h - Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/download/download_in_progress_dialog_view.h

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10	10

(...skipping 29 matching lines...) Expand all Loading...
40 virtual bool Cancel() OVERRIDE;	40 virtual bool Cancel() OVERRIDE;

41 virtual bool Accept() OVERRIDE;	41 virtual bool Accept() OVERRIDE;

42 virtual bool IsModal() const OVERRIDE;	42 virtual bool IsModal() const OVERRIDE;

43 virtual string16 GetWindowTitle() const OVERRIDE;	43 virtual string16 GetWindowTitle() const OVERRIDE;

44 virtual views::View* GetContentsView() OVERRIDE;	44 virtual views::View* GetContentsView() OVERRIDE;

45	45

46 Browser* browser_;	46 Browser* browser_;

47 views::Label* warning_;	47 views::Label* warning_;

48 views::Label* explanation_;	48 views::Label* explanation_;

49	49

50 string16 ok_button_text_;	50 std::wstring ok_button_text_;

51 string16 cancel_button_text_;	51 std::wstring cancel_button_text_;

52	52

53 string16 product_name_;	53 string16 product_name_;

54	54

55 gfx::Size dialog_dimensions_;	55 gfx::Size dialog_dimensions_;

56	56

57 DISALLOW_COPY_AND_ASSIGN(DownloadInProgressDialogView);	57 DISALLOW_COPY_AND_ASSIGN(DownloadInProgressDialogView);

58 };	58 };

59	59

60 #endif // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_	60 #endif // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_

OLD	NEW