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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 11896021: Change the one-click sign in confirmation bubble into a modal dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 11 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "base/memory/scoped_nsobject.h" 8 #include "base/memory/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 Profile* profile) OVERRIDE; 91 Profile* profile) OVERRIDE;
92 virtual void ToggleBookmarkBar() OVERRIDE; 92 virtual void ToggleBookmarkBar() OVERRIDE;
93 virtual void ShowUpdateChromeDialog() OVERRIDE; 93 virtual void ShowUpdateChromeDialog() OVERRIDE;
94 virtual void ShowTaskManager() OVERRIDE; 94 virtual void ShowTaskManager() OVERRIDE;
95 virtual void ShowBackgroundPages() OVERRIDE; 95 virtual void ShowBackgroundPages() OVERRIDE;
96 virtual void ShowBookmarkBubble(const GURL& url, 96 virtual void ShowBookmarkBubble(const GURL& url,
97 bool already_bookmarked) OVERRIDE; 97 bool already_bookmarked) OVERRIDE;
98 virtual void ShowChromeToMobileBubble() OVERRIDE; 98 virtual void ShowChromeToMobileBubble() OVERRIDE;
99 #if defined(ENABLE_ONE_CLICK_SIGNIN) 99 #if defined(ENABLE_ONE_CLICK_SIGNIN)
100 virtual void ShowOneClickSigninBubble( 100 virtual void ShowOneClickSigninBubble(
101 OneClickSigninBubbleType type,
101 const StartSyncCallback& start_sync_callback) OVERRIDE; 102 const StartSyncCallback& start_sync_callback) OVERRIDE;
102 #endif 103 #endif
103 virtual bool IsDownloadShelfVisible() const OVERRIDE; 104 virtual bool IsDownloadShelfVisible() const OVERRIDE;
104 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; 105 virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
105 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; 106 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
106 virtual void UserChangedTheme() OVERRIDE; 107 virtual void UserChangedTheme() OVERRIDE;
107 virtual int GetExtraRenderViewHeight() const OVERRIDE; 108 virtual int GetExtraRenderViewHeight() const OVERRIDE;
108 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; 109 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
109 virtual void ShowPageInfo(content::WebContents* web_contents, 110 virtual void ShowPageInfo(content::WebContents* web_contents,
110 const GURL& url, 111 const GURL& url,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 165
165 Browser* browser_; // weak, owned by controller 166 Browser* browser_; // weak, owned by controller
166 BrowserWindowController* controller_; // weak, owns us 167 BrowserWindowController* controller_; // weak, owns us
167 base::WeakPtrFactory<Browser> confirm_close_factory_; 168 base::WeakPtrFactory<Browser> confirm_close_factory_;
168 scoped_nsobject<NSString> pending_window_title_; 169 scoped_nsobject<NSString> pending_window_title_;
169 ui::WindowShowState initial_show_state_; 170 ui::WindowShowState initial_show_state_;
170 NSInteger attention_request_id_; // identifier from requestUserAttention 171 NSInteger attention_request_id_; // identifier from requestUserAttention
171 }; 172 };
172 173
173 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698