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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.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: Reverted a few sign changes missed in last patchset Created 4 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
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/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 FindBar* CreateFindBar() override; 157 FindBar* CreateFindBar() override;
158 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 158 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
159 override; 159 override;
160 void ShowAvatarBubbleFromAvatarButton( 160 void ShowAvatarBubbleFromAvatarButton(
161 AvatarBubbleMode mode, 161 AvatarBubbleMode mode,
162 const signin::ManageAccountsParams& manage_accounts_params, 162 const signin::ManageAccountsParams& manage_accounts_params,
163 signin_metrics::AccessPoint access_point) override; 163 signin_metrics::AccessPoint access_point) override;
164 void ShowModalSigninWindow(AvatarBubbleMode mode, 164 void ShowModalSigninWindow(AvatarBubbleMode mode,
165 signin_metrics::AccessPoint access_point) override; 165 signin_metrics::AccessPoint access_point) override;
166 void CloseModalSigninWindow() override; 166 void CloseModalSigninWindow() override;
167 void ShowModalSyncConfirmationWindow();
167 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 168 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
168 void ExecuteExtensionCommand(const extensions::Extension* extension, 169 void ExecuteExtensionCommand(const extensions::Extension* extension,
169 const extensions::Command& command) override; 170 const extensions::Command& command) override;
170 ExclusiveAccessContext* GetExclusiveAccessContext() override; 171 ExclusiveAccessContext* GetExclusiveAccessContext() override;
171 172
172 // ExclusiveAccessContext interface 173 // ExclusiveAccessContext interface
173 Profile* GetProfile() override; 174 Profile* GetProfile() override;
174 content::WebContents* GetActiveWebContents() override; 175 content::WebContents* GetActiveWebContents() override;
175 void UnhideDownloadShelf() override; 176 void UnhideDownloadShelf() override;
176 void HideDownloadShelf() override; 177 void HideDownloadShelf() override;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 ui::WindowShowState initial_show_state_; 213 ui::WindowShowState initial_show_state_;
213 NSInteger attention_request_id_; // identifier from requestUserAttention 214 NSInteger attention_request_id_; // identifier from requestUserAttention
214 215
215 // Preserves window media state to show appropriate icon in the window title 216 // Preserves window media state to show appropriate icon in the window title
216 // which can be audio playing, muting or none (determined by media state of 217 // which can be audio playing, muting or none (determined by media state of
217 // tabs. 218 // tabs.
218 TabMediaState media_state_; 219 TabMediaState media_state_;
219 }; 220 };
220 221
221 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 222 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698