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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move strings to resources and properly enable the settings link. Created 5 years 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 (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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 WindowOpenDisposition GetDispositionForPopupBounds( 360 WindowOpenDisposition GetDispositionForPopupBounds(
361 const gfx::Rect& bounds) override; 361 const gfx::Rect& bounds) override;
362 FindBar* CreateFindBar() override; 362 FindBar* CreateFindBar() override;
363 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 363 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
364 override; 364 override;
365 void ShowAvatarBubbleFromAvatarButton( 365 void ShowAvatarBubbleFromAvatarButton(
366 AvatarBubbleMode mode, 366 AvatarBubbleMode mode,
367 const signin::ManageAccountsParams& manage_accounts_params) override; 367 const signin::ManageAccountsParams& manage_accounts_params) override;
368 void ShowModalSigninWindow(AvatarBubbleMode mode) override; 368 void ShowModalSigninWindow(AvatarBubbleMode mode) override;
369 void CloseModalSigninWindow() override; 369 void CloseModalSigninWindow() override;
370 void ShowModalSyncConfirmationWindow() override;
370 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 371 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
371 void ExecuteExtensionCommand(const extensions::Extension* extension, 372 void ExecuteExtensionCommand(const extensions::Extension* extension,
372 const extensions::Command& command) override; 373 const extensions::Command& command) override;
373 ExclusiveAccessContext* GetExclusiveAccessContext() override; 374 ExclusiveAccessContext* GetExclusiveAccessContext() override;
374 375
375 BookmarkBarView* GetBookmarkBarView() const; 376 BookmarkBarView* GetBookmarkBarView() const;
376 LocationBarView* GetLocationBarView() const; 377 LocationBarView* GetLocationBarView() const;
377 views::View* GetTabContentsContainerView() const; 378 views::View* GetTabContentsContainerView() const;
378 ToolbarView* GetToolbarView() const; 379 ToolbarView* GetToolbarView() const;
379 380
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 710 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
710 711
711 SigninViewController signin_view_controller_; 712 SigninViewController signin_view_controller_;
712 713
713 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 714 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
714 715
715 DISALLOW_COPY_AND_ASSIGN(BrowserView); 716 DISALLOW_COPY_AND_ASSIGN(BrowserView);
716 }; 717 };
717 718
718 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 719 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698