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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h" 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #import <AppKit/AppKit.h> 9 #import <AppKit/AppKit.h>
10 10
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 - (void)resetCertificateDecisions:(id)sender { 519 - (void)resetCertificateDecisions:(id)sender {
520 DCHECK(resetDecisionsButton_); 520 DCHECK(resetDecisionsButton_);
521 presenter_->OnRevokeSSLErrorBypassButtonPressed(); 521 presenter_->OnRevokeSSLErrorBypassButtonPressed();
522 [self close]; 522 [self close];
523 } 523 }
524 524
525 // Handler for the link to show help information about the connection tab. 525 // Handler for the link to show help information about the connection tab.
526 - (void)showHelpPage:(id)sender { 526 - (void)showHelpPage:(id)sender {
527 webContents_->OpenURL(content::OpenURLParams( 527 webContents_->OpenURL(content::OpenURLParams(
528 GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(), 528 GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
529 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); 529 NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
530 } 530 }
531 531
532 // Create the contents of the Connection tab and add it to the given tab view. 532 // Create the contents of the Connection tab and add it to the given tab view.
533 // Returns a weak reference to the tab view item's view. 533 // Returns a weak reference to the tab view item's view.
534 - (NSView*)addConnectionTabToTabView:(NSTabView*)tabView { 534 - (NSView*)addConnectionTabToTabView:(NSTabView*)tabView {
535 base::scoped_nsobject<NSTabViewItem> item([[NSTabViewItem alloc] init]); 535 base::scoped_nsobject<NSTabViewItem> item([[NSTabViewItem alloc] init]);
536 base::scoped_nsobject<NSView> contentView( 536 base::scoped_nsobject<NSView> contentView(
537 [[FlippedView alloc] initWithFrame:[tabView_ contentRect]]); 537 [[FlippedView alloc] initWithFrame:[tabView_ contentRect]]);
538 [contentView setAutoresizingMask:NSViewWidthSizable]; 538 [contentView setAutoresizingMask:NSViewWidthSizable];
539 539
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 [bubble_controller_ setPermissionInfo:permission_info_list]; 1219 [bubble_controller_ setPermissionInfo:permission_info_list];
1220 } 1220 }
1221 1221
1222 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) { 1222 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) {
1223 [bubble_controller_ setFirstVisit:first_visit]; 1223 [bubble_controller_ setFirstVisit:first_visit];
1224 } 1224 }
1225 1225
1226 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1226 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1227 [bubble_controller_ setSelectedTab:tab_id]; 1227 [bubble_controller_ setSelectedTab:tab_id];
1228 } 1228 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/web_dialog_window_controller.mm ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698