chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm - Issue 446073002: Add ManagePasswordsBubbleBlacklistViewController and unit tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm

Issue 446073002: Add ManagePasswordsBubbleBlacklistViewController and unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: finalize Created 6 years, 4 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

« no previous file with comments | « chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm ('k') | chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm

index ac2b825a1e46a06483872ff431d2ae6b086069b8..1f6b53570d477116a8ea93662e7d7191b8979fb8 100644

--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm

@@ -10,6 +10,7 @@

#import "chrome/browser/ui/cocoa/info_bubble_window.h"

#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller.h"

#include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

+#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller.h"

#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller.h"

#include "ui/base/cocoa/window_size_constants.h"

@@ -43,7 +44,6 @@

- (void)updateState {

// Find the next view controller.

- // TODO(dconnelly): Handle other states once they're implemented.

currentController_.reset();

if (password_manager::ui::IsPendingState(model_->state())) {

currentController_.reset(

@@ -59,6 +59,13 @@

currentController_.reset([[ManagePasswordsBubbleManageViewController alloc]

initWithModel:model_

delegate:self]);

+ } else if (model_->state() == password_manager::ui::BLACKLIST_STATE) {

+ currentController_.reset(

+ [[ManagePasswordsBubbleBlacklistViewController alloc]

+ initWithModel:model_

+ delegate:self]);

+ } else {

+ NOTREACHED();

}

[self performLayout];

}