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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 virtual void ToggleBookmarkBar() OVERRIDE; 311 virtual void ToggleBookmarkBar() OVERRIDE;
312 virtual void ShowUpdateChromeDialog() OVERRIDE; 312 virtual void ShowUpdateChromeDialog() OVERRIDE;
313 virtual void ShowTaskManager() OVERRIDE; 313 virtual void ShowTaskManager() OVERRIDE;
314 virtual void ShowBackgroundPages() OVERRIDE; 314 virtual void ShowBackgroundPages() OVERRIDE;
315 virtual void ShowBookmarkBubble(const GURL& url, 315 virtual void ShowBookmarkBubble(const GURL& url,
316 bool already_bookmarked) OVERRIDE; 316 bool already_bookmarked) OVERRIDE;
317 virtual void ShowBookmarkPrompt() OVERRIDE; 317 virtual void ShowBookmarkPrompt() OVERRIDE;
318 virtual void ShowChromeToMobileBubble() OVERRIDE; 318 virtual void ShowChromeToMobileBubble() OVERRIDE;
319 #if defined(ENABLE_ONE_CLICK_SIGNIN) 319 #if defined(ENABLE_ONE_CLICK_SIGNIN)
320 virtual void ShowOneClickSigninBubble( 320 virtual void ShowOneClickSigninBubble(
321 OneClickSigninBubbleType type,
321 const StartSyncCallback& start_sync_callback) OVERRIDE; 322 const StartSyncCallback& start_sync_callback) OVERRIDE;
322 #endif 323 #endif
323 // TODO(beng): Not an override, move somewhere else. 324 // TODO(beng): Not an override, move somewhere else.
324 void SetDownloadShelfVisible(bool visible); 325 void SetDownloadShelfVisible(bool visible);
325 virtual bool IsDownloadShelfVisible() const OVERRIDE; 326 virtual bool IsDownloadShelfVisible() const OVERRIDE;
326 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; 327 virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
327 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; 328 virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
328 virtual void UserChangedTheme() OVERRIDE; 329 virtual void UserChangedTheme() OVERRIDE;
329 virtual int GetExtraRenderViewHeight() const OVERRIDE; 330 virtual int GetExtraRenderViewHeight() const OVERRIDE;
330 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; 331 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 gfx::ScopedSysColorChangeListener color_change_listener_; 753 gfx::ScopedSysColorChangeListener color_change_listener_;
753 754
754 scoped_ptr<InstantPreviewControllerViews> preview_controller_; 755 scoped_ptr<InstantPreviewControllerViews> preview_controller_;
755 756
756 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 757 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
757 758
758 DISALLOW_COPY_AND_ASSIGN(BrowserView); 759 DISALLOW_COPY_AND_ASSIGN(BrowserView);
759 }; 760 };
760 761
761 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 762 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698