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

Unified Diff: chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc

Issue 2348853004: Remove non-md code in location bar (Views). (Closed)
Patch Set: resolve change collision Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
index a7d88fca0c0d1144c2a62b915f584b973467a1f4..12a7e94dea64e3e20514f6abdd30d283c2b2a471 100644
--- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
+++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
@@ -6,25 +6,18 @@
#include "chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h"
#include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
#include "components/pdf/browser/open_pdf_in_reader_prompt_client.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
#include "ui/native_theme/native_theme.h"
#include "ui/views/widget/widget.h"
-OpenPDFInReaderView::OpenPDFInReaderView() : bubble_(NULL), model_(NULL) {
+OpenPDFInReaderView::OpenPDFInReaderView() : bubble_(nullptr), model_(nullptr) {
SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
- if (!ui::MaterialDesignController::IsModeMaterial()) {
- SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_OMNIBOX_PDF_ICON));
- }
SetTooltipText(l10n_util::GetStringUTF16(IDS_PDF_BUBBLE_OPEN_IN_READER_LINK));
}
@@ -34,7 +27,7 @@ OpenPDFInReaderView::~OpenPDFInReaderView() {
}
void OpenPDFInReaderView::Update(content::WebContents* web_contents) {
- model_ = NULL;
+ model_ = nullptr;
if (web_contents) {
pdf::PDFWebContentsHelper* pdf_tab_helper =
pdf::PDFWebContentsHelper::FromWebContents(web_contents);
@@ -87,12 +80,10 @@ bool OpenPDFInReaderView::OnKeyPressed(const ui::KeyEvent& event) {
void OpenPDFInReaderView::OnNativeThemeChanged(
const ui::NativeTheme* native_theme) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- SetImage(gfx::CreateVectorIcon(
- gfx::VectorIconId::PDF,
- color_utils::DeriveDefaultIconColor(native_theme->GetSystemColor(
- ui::NativeTheme::kColorId_TextfieldDefaultColor))));
- }
+ SetImage(gfx::CreateVectorIcon(
+ gfx::VectorIconId::PDF,
+ color_utils::DeriveDefaultIconColor(native_theme->GetSystemColor(
+ ui::NativeTheme::kColorId_TextfieldDefaultColor))));
}
void OpenPDFInReaderView::OnWidgetDestroying(views::Widget* widget) {
@@ -100,5 +91,5 @@ void OpenPDFInReaderView::OnWidgetDestroying(views::Widget* widget) {
return;
bubble_->GetWidget()->RemoveObserver(this);
- bubble_ = NULL;
+ bubble_ = nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698