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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: back out the changes to one_click_signin_bubble_view.* Created 7 years, 8 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
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 #include "chrome/browser/ui/views/content_setting_bubble_contents.h" 5 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
16 #include "chrome/browser/plugins/plugin_finder.h" 16 #include "chrome/browser/plugins/plugin_finder.h"
17 #include "chrome/browser/plugins/plugin_metadata.h" 17 #include "chrome/browser/plugins/plugin_metadata.h"
18 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 18 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
19 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" 19 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
20 #include "chrome/browser/ui/views/browser_dialogs.h" 20 #include "chrome/browser/ui/views/browser_dialogs.h"
21 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
22 #include "content/public/browser/notification_types.h" 22 #include "content/public/browser/notification_types.h"
23 #include "content/public/browser/plugin_service.h" 23 #include "content/public/browser/plugin_service.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/models/simple_menu_model.h" 28 #include "ui/base/models/simple_menu_model.h"
29 #include "ui/views/controls/button/label_button.h"
29 #include "ui/views/controls/button/menu_button.h" 30 #include "ui/views/controls/button/menu_button.h"
30 #include "ui/views/controls/button/radio_button.h" 31 #include "ui/views/controls/button/radio_button.h"
31 #include "ui/views/controls/button/text_button.h"
32 #include "ui/views/controls/image_view.h" 32 #include "ui/views/controls/image_view.h"
33 #include "ui/views/controls/label.h" 33 #include "ui/views/controls/label.h"
34 #include "ui/views/controls/link.h" 34 #include "ui/views/controls/link.h"
35 #include "ui/views/controls/menu/menu.h" 35 #include "ui/views/controls/menu/menu.h"
36 #include "ui/views/controls/menu/menu_runner.h" 36 #include "ui/views/controls/menu/menu_runner.h"
37 #include "ui/views/controls/separator.h" 37 #include "ui/views/controls/separator.h"
38 #include "ui/views/layout/grid_layout.h" 38 #include "ui/views/layout/grid_layout.h"
39 #include "ui/views/layout/layout_constants.h" 39 #include "ui/views/layout/layout_constants.h"
40 40
41 #if defined(USE_AURA) 41 #if defined(USE_AURA)
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 double_column_set->AddPaddingColumn( 395 double_column_set->AddPaddingColumn(
396 0, views::kUnrelatedControlHorizontalSpacing); 396 0, views::kUnrelatedControlHorizontalSpacing);
397 double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0, 397 double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
398 GridLayout::USE_PREF, 0, 0); 398 GridLayout::USE_PREF, 0, 0);
399 399
400 layout->StartRow(0, kDoubleColumnSetId); 400 layout->StartRow(0, kDoubleColumnSetId);
401 manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link)); 401 manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
402 manage_link_->set_listener(this); 402 manage_link_->set_listener(this);
403 layout->AddView(manage_link_); 403 layout->AddView(manage_link_);
404 404
405 close_button_ = new views::NativeTextButton( 405 close_button_ = new views::LabelButton(
406 this, l10n_util::GetStringUTF16(IDS_DONE)); 406 this, l10n_util::GetStringUTF16(IDS_DONE));
407 close_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
407 layout->AddView(close_button_); 408 layout->AddView(close_button_);
408 } 409 }
409 410
410 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender, 411 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
411 const ui::Event& event) { 412 const ui::Event& event) {
412 if (sender == close_button_) { 413 if (sender == close_button_) {
413 content_setting_bubble_model_->OnDoneClicked(); 414 content_setting_bubble_model_->OnDoneClicked();
414 StartFade(false); 415 StartFade(false);
415 return; 416 return;
416 } 417 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 int width = button->GetPreferredSize().width(); 482 int width = button->GetPreferredSize().width();
482 for (int i = 0; i < menu_model->GetItemCount(); ++i) { 483 for (int i = 0; i < menu_model->GetItemCount(); ++i) {
483 button->SetText(menu_model->GetLabelAt(i)); 484 button->SetText(menu_model->GetLabelAt(i));
484 width = std::max(width, button->GetPreferredSize().width()); 485 width = std::max(width, button->GetPreferredSize().width());
485 } 486 }
486 487
487 // Recover the title for the menu button. 488 // Recover the title for the menu button.
488 button->SetText(title); 489 button->SetText(title);
489 return width; 490 return width;
490 } 491 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.h ('k') | chrome/browser/ui/views/critical_notification_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698