Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Side by Side Diff: chrome/browser/ui/views/uninstall_view.h

Issue 10909140: views: Remove wstring usage from UninstallView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/uninstall_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_UNINSTALL_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h"
10 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h"
11 #include "base/string16.h" 13 #include "base/string16.h"
12 #include "ui/base/models/combobox_model.h" 14 #include "ui/base/models/combobox_model.h"
13 #include "ui/views/window/dialog_delegate.h" 15 #include "ui/views/window/dialog_delegate.h"
14 16
15 namespace views { 17 namespace views {
16 class Checkbox; 18 class Checkbox;
17 class Combobox; 19 class Combobox;
18 class Label; 20 class Label;
19 } 21 }
20 22
(...skipping 19 matching lines...) Expand all
40 42
41 // Overridden from views::WidgetDelegate: 43 // Overridden from views::WidgetDelegate:
42 virtual string16 GetWindowTitle() const OVERRIDE; 44 virtual string16 GetWindowTitle() const OVERRIDE;
43 virtual views::View* GetContentsView() OVERRIDE; 45 virtual views::View* GetContentsView() OVERRIDE;
44 46
45 // Overridden from ui::ComboboxModel: 47 // Overridden from ui::ComboboxModel:
46 virtual int GetItemCount() const OVERRIDE; 48 virtual int GetItemCount() const OVERRIDE;
47 virtual string16 GetItemAt(int index) OVERRIDE; 49 virtual string16 GetItemAt(int index) OVERRIDE;
48 50
49 private: 51 private:
52 typedef std::map<string16, string16> BrowsersMap;
53
50 // Initializes the controls on the dialog. 54 // Initializes the controls on the dialog.
51 void SetupControls(); 55 void SetupControls();
52 56
53 views::Label* confirm_label_; 57 views::Label* confirm_label_;
54 views::Checkbox* delete_profile_; 58 views::Checkbox* delete_profile_;
55 views::Checkbox* change_default_browser_; 59 views::Checkbox* change_default_browser_;
56 views::Combobox* browsers_combo_; 60 views::Combobox* browsers_combo_;
57 typedef std::map<std::wstring, std::wstring> BrowsersMap;
58 scoped_ptr<BrowsersMap> browsers_; 61 scoped_ptr<BrowsersMap> browsers_;
59 int& user_selection_; 62 int& user_selection_;
60 base::Closure quit_closure_; 63 base::Closure quit_closure_;
61 64
62 DISALLOW_COPY_AND_ASSIGN(UninstallView); 65 DISALLOW_COPY_AND_ASSIGN(UninstallView);
63 }; 66 };
64 67
65 #endif // CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_ 68 #endif // CHROME_BROWSER_UI_VIEWS_UNINSTALL_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/uninstall_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698