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

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

Issue 1413533009: Make the new Gaia password separated signin flow modal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac build 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>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/timer/timer.h" 15 #include "base/timer/timer.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/devtools/devtools_window.h" 17 #include "chrome/browser/devtools/devtools_window.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 20 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
21 #include "chrome/browser/ui/infobar_container_delegate.h" 21 #include "chrome/browser/ui/infobar_container_delegate.h"
22 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 22 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
23 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" 23 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"
24 #include "chrome/browser/ui/views/frame/browser_frame.h" 24 #include "chrome/browser/ui/views/frame/browser_frame.h"
25 #include "chrome/browser/ui/views/frame/contents_web_view.h" 25 #include "chrome/browser/ui/views/frame/contents_web_view.h"
26 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 26 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
27 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 27 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
28 #include "chrome/browser/ui/views/load_complete_listener.h" 28 #include "chrome/browser/ui/views/load_complete_listener.h"
29 #include "chrome/browser/ui/views/profiles/signin_view_controller.h"
29 #include "components/omnibox/browser/omnibox_popup_model_observer.h" 30 #include "components/omnibox/browser/omnibox_popup_model_observer.h"
30 #include "ui/base/accelerators/accelerator.h" 31 #include "ui/base/accelerators/accelerator.h"
31 #include "ui/base/models/simple_menu_model.h" 32 #include "ui/base/models/simple_menu_model.h"
32 #include "ui/gfx/native_widget_types.h" 33 #include "ui/gfx/native_widget_types.h"
33 #include "ui/views/controls/button/button.h" 34 #include "ui/views/controls/button/button.h"
34 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" 35 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
35 #include "ui/views/widget/widget_delegate.h" 36 #include "ui/views/widget/widget_delegate.h"
36 #include "ui/views/widget/widget_observer.h" 37 #include "ui/views/widget/widget_observer.h"
37 #include "ui/views/window/client_view.h" 38 #include "ui/views/window/client_view.h"
38 39
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 const content::NativeWebKeyboardEvent& event) override; 356 const content::NativeWebKeyboardEvent& event) override;
356 void CutCopyPaste(int command_id) override; 357 void CutCopyPaste(int command_id) override;
357 WindowOpenDisposition GetDispositionForPopupBounds( 358 WindowOpenDisposition GetDispositionForPopupBounds(
358 const gfx::Rect& bounds) override; 359 const gfx::Rect& bounds) override;
359 FindBar* CreateFindBar() override; 360 FindBar* CreateFindBar() override;
360 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 361 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
361 override; 362 override;
362 void ShowAvatarBubbleFromAvatarButton( 363 void ShowAvatarBubbleFromAvatarButton(
363 AvatarBubbleMode mode, 364 AvatarBubbleMode mode,
364 const signin::ManageAccountsParams& manage_accounts_params) override; 365 const signin::ManageAccountsParams& manage_accounts_params) override;
366 void ShowModalSigninWindow(AvatarBubbleMode mode) override;
367 void CloseModalSigninWindow() override;
365 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 368 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
366 void ExecuteExtensionCommand(const extensions::Extension* extension, 369 void ExecuteExtensionCommand(const extensions::Extension* extension,
367 const extensions::Command& command) override; 370 const extensions::Command& command) override;
368 ExclusiveAccessContext* GetExclusiveAccessContext() override; 371 ExclusiveAccessContext* GetExclusiveAccessContext() override;
369 372
370 BookmarkBarView* GetBookmarkBarView() const; 373 BookmarkBarView* GetBookmarkBarView() const;
371 LocationBarView* GetLocationBarView() const; 374 LocationBarView* GetLocationBarView() const;
372 views::View* GetTabContentsContainerView() const; 375 views::View* GetTabContentsContainerView() const;
373 ToolbarView* GetToolbarView() const; 376 ToolbarView* GetToolbarView() const;
374 377
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 base::TimeTicks last_animation_time_; 699 base::TimeTicks last_animation_time_;
697 700
698 // If this flag is set then SetFocusToLocationBar() will set focus to the 701 // If this flag is set then SetFocusToLocationBar() will set focus to the
699 // location bar even if the browser window is not active. 702 // location bar even if the browser window is not active.
700 bool force_location_bar_focus_; 703 bool force_location_bar_focus_;
701 704
702 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 705 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
703 706
704 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 707 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
705 708
709 SigninViewController signin_view_controller_;
710
706 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 711 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
707 712
708 DISALLOW_COPY_AND_ASSIGN(BrowserView); 713 DISALLOW_COPY_AND_ASSIGN(BrowserView);
709 }; 714 };
710 715
711 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 716 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698