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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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
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/website_settings/website_settings_popup_view.h " 5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 GetAnchorView()->GetWidget()->GetNativeWindow() : NULL; 398 GetAnchorView()->GetWidget()->GetNativeWindow() : NULL;
399 ShowCertificateViewerByID(web_contents_, parent, cert_id_); 399 ShowCertificateViewerByID(web_contents_, parent, cert_id_);
400 } else if (source == signed_certificate_timestamps_link_) { 400 } else if (source == signed_certificate_timestamps_link_) {
401 chrome::ShowSignedCertificateTimestampsViewer( 401 chrome::ShowSignedCertificateTimestampsViewer(
402 web_contents_, signed_certificate_timestamp_ids_); 402 web_contents_, signed_certificate_timestamp_ids_);
403 } else if (source == help_center_link_) { 403 } else if (source == help_center_link_) {
404 browser_->OpenURL( 404 browser_->OpenURL(
405 content::OpenURLParams(GURL(chrome::kPageInfoHelpCenterURL), 405 content::OpenURLParams(GURL(chrome::kPageInfoHelpCenterURL),
406 content::Referrer(), 406 content::Referrer(),
407 NEW_FOREGROUND_TAB, 407 NEW_FOREGROUND_TAB,
408 content::PAGE_TRANSITION_LINK, 408 ui::PAGE_TRANSITION_LINK,
409 false)); 409 false));
410 } 410 }
411 } 411 }
412 412
413 void WebsiteSettingsPopupView::TabSelectedAt(int index) { 413 void WebsiteSettingsPopupView::TabSelectedAt(int index) {
414 tabbed_pane_->GetSelectedTab()->Layout(); 414 tabbed_pane_->GetSelectedTab()->Layout();
415 SizeToContents(); 415 SizeToContents();
416 } 416 }
417 417
418 gfx::Size WebsiteSettingsPopupView::GetPreferredSize() const { 418 gfx::Size WebsiteSettingsPopupView::GetPreferredSize() const {
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 807
808 if (reset_decisions_button) { 808 if (reset_decisions_button) {
809 content_layout->StartRow(1, 0); 809 content_layout->StartRow(1, 0);
810 content_layout->AddView(reset_decisions_button); 810 content_layout->AddView(reset_decisions_button);
811 } 811 }
812 812
813 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, 813 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
814 views::GridLayout::LEADING); 814 views::GridLayout::LEADING);
815 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); 815 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
816 } 816 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/translate/translate_bubble_view.cc ('k') | chrome/browser/ui/webui/chrome_web_contents_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698