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

Side by Side Diff: chrome/browser/ui/views/translate/translate_bubble_view.h

Issue 98643003: Translate new UX: Fix the visual and behavior of 'Done' button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky's review Created 7 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, TranslateButton); 101 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, TranslateButton);
102 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, AdvancedLink); 102 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, AdvancedLink);
103 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, ShowOriginalButton); 103 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, ShowOriginalButton);
104 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, TryAgainButton); 104 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, TryAgainButton);
105 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, 105 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest,
106 AlwaysTranslateCheckboxAndCancelButton); 106 AlwaysTranslateCheckboxAndCancelButton);
107 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, 107 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest,
108 AlwaysTranslateCheckboxAndDoneButton); 108 AlwaysTranslateCheckboxAndDoneButton);
109 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, DoneButton); 109 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, DoneButton);
110 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, 110 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest,
111 DoneButtonWithoutTranslating);
112 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest,
111 CancelButtonReturningBeforeTranslate); 113 CancelButtonReturningBeforeTranslate);
112 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, 114 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest,
113 CancelButtonReturningAfterTranslate); 115 CancelButtonReturningAfterTranslate);
114 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, CancelButtonReturningError); 116 FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, CancelButtonReturningError);
115 117
116 TranslateBubbleView(views::View* anchor_view, 118 TranslateBubbleView(views::View* anchor_view,
117 scoped_ptr<TranslateBubbleModel> model, 119 scoped_ptr<TranslateBubbleModel> model,
118 Browser* browser, 120 Browser* browser,
119 content::WebContents* web_contents); 121 content::WebContents* web_contents);
120 122
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 169
168 scoped_ptr<LanguageComboboxModel> source_language_combobox_model_; 170 scoped_ptr<LanguageComboboxModel> source_language_combobox_model_;
169 scoped_ptr<LanguageComboboxModel> target_language_combobox_model_; 171 scoped_ptr<LanguageComboboxModel> target_language_combobox_model_;
170 172
171 views::Combobox* denial_combobox_; 173 views::Combobox* denial_combobox_;
172 views::Combobox* source_language_combobox_; 174 views::Combobox* source_language_combobox_;
173 views::Combobox* target_language_combobox_; 175 views::Combobox* target_language_combobox_;
174 176
175 views::Checkbox* always_translate_checkbox_; 177 views::Checkbox* always_translate_checkbox_;
176 178
179 views::LabelButton* advanced_cancel_button_;
180 views::LabelButton* advanced_done_button_;
181
177 scoped_ptr<TranslateBubbleModel> model_; 182 scoped_ptr<TranslateBubbleModel> model_;
178 183
179 // Whether the window is an incognito window. 184 // Whether the window is an incognito window.
180 const bool is_in_incognito_window_; 185 const bool is_in_incognito_window_;
181 186
182 // The browser to open the help URL into a new tab. 187 // The browser to open the help URL into a new tab.
183 Browser* browser_; 188 Browser* browser_;
184 189
185 // Whether the translation is acutually executed. 190 // Whether the translation is acutually executed.
186 bool translate_executed_; 191 bool translate_executed_;
187 192
188 DISALLOW_COPY_AND_ASSIGN(TranslateBubbleView); 193 DISALLOW_COPY_AND_ASSIGN(TranslateBubbleView);
189 }; 194 };
190 195
191 #endif // CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_ 196 #endif // CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/translate/translate_bubble_model_impl.cc ('k') | chrome/browser/ui/views/translate/translate_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698