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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 5fddda775ac50820fce981735331d1b61b0d978e..6fc17b948ab58c25b700e88e856f51cc1152eb51 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -864,6 +864,7 @@
'browser/ui/settings_window_manager.cc',
'browser/ui/settings_window_manager.h',
'browser/ui/settings_window_manager_observer.h',
+ 'browser/ui/profile_reset_bubble.h',
'browser/ui/simple_message_box.h',
'browser/ui/status_bubble.h',
'browser/ui/sync/inline_login_dialog.cc',
@@ -2175,6 +2176,8 @@
'browser/ui/views/profiles/new_avatar_button.h',
'browser/ui/views/profiles/profile_chooser_view.cc',
'browser/ui/views/profiles/profile_chooser_view.h',
+ 'browser/ui/views/profiles/profile_reset_bubble_view.cc',
+ 'browser/ui/views/profiles/profile_reset_bubble_view.h',
'browser/ui/views/profiles/user_manager_view.cc',
'browser/ui/views/profiles/user_manager_view.h',
'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
@@ -2313,6 +2316,9 @@
'browser/ui/webui/gesture_config_ui.h',
'browser/ui/window_sizer/window_sizer_aura.cc',
],
+ 'chrome_browser_ui_non_aura_sources': [
+ 'browser/ui/profile_reset_bubble_stub.cc',
+ ],
# Aura but not ChromeOS.
'chrome_browser_ui_aura_non_chromeos': [
'browser/ui/aura/active_desktop_monitor.cc',
@@ -2766,6 +2772,8 @@
'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
}],
],
+ }, { # else: use_aura==0
+ 'sources': [ '<@(chrome_browser_ui_non_aura_sources)' ],
}],
['ui_compositor_image_transport==1', {
'dependencies': [
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698