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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h

Issue 2784823002: Reland "Use the same browser instance in the sync confirmation dialog. (Closed)
Patch Set: Rebase and fix conflicts Created 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 28 matching lines...) Expand all
39 // Creates the web view that contains the signin flow in |mode| using 39 // Creates the web view that contains the signin flow in |mode| using
40 // |profile| as the web content's profile, then sets |delegate| as the created 40 // |profile| as the web content's profile, then sets |delegate| as the created
41 // web content's delegate. 41 // web content's delegate.
42 static std::unique_ptr<content::WebContents> CreateGaiaWebContents( 42 static std::unique_ptr<content::WebContents> CreateGaiaWebContents(
43 content::WebContentsDelegate* delegate, 43 content::WebContentsDelegate* delegate,
44 profiles::BubbleViewMode mode, 44 profiles::BubbleViewMode mode,
45 Profile* profile, 45 Profile* profile,
46 signin_metrics::AccessPoint access_point); 46 signin_metrics::AccessPoint access_point);
47 47
48 static std::unique_ptr<content::WebContents> 48 static std::unique_ptr<content::WebContents>
49 CreateSyncConfirmationWebContents(Profile* profile); 49 CreateSyncConfirmationWebContents(Browser* browser);
50 50
51 static std::unique_ptr<content::WebContents> CreateSigninErrorWebContents( 51 static std::unique_ptr<content::WebContents> CreateSigninErrorWebContents(
52 Profile* profile); 52 Profile* profile);
53 53
54 private: 54 private:
55 friend SigninViewControllerDelegate; 55 friend SigninViewControllerDelegate;
56 56
57 // Creates and displays a constrained window containing |web_contents|. If 57 // Creates and displays a constrained window containing |web_contents|. If
58 // |wait_for_size| is true, the delegate will wait for ResizeNativeView() to 58 // |wait_for_size| is true, the delegate will wait for ResizeNativeView() to
59 // be called by the base class before displaying the constrained window. 59 // be called by the base class before displaying the constrained window.
(...skipping 30 matching lines...) Expand all
90 90
91 // The dialog modal presentation type. 91 // The dialog modal presentation type.
92 ui::ModalType dialog_modal_type_; 92 ui::ModalType dialog_modal_type_;
93 93
94 NSRect window_frame_; 94 NSRect window_frame_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(SigninViewControllerDelegateMac); 96 DISALLOW_COPY_AND_ASSIGN(SigninViewControllerDelegateMac);
97 }; 97 };
98 98
99 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_ H_ 99 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_MAC_ H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698