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

Side by Side Diff: chrome/browser/ui/chrome_pages.cc

Issue 2927273002: Move code for old, deprecated Options UI to only ChromeOS (Closed)
Patch Set: check_gn_headers Created 3 years, 6 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 #include "chrome/browser/ui/chrome_pages.h" 5 #include "chrome/browser/ui/chrome_pages.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/ui/browser_finder.h" 22 #include "chrome/browser/ui/browser_finder.h"
23 #include "chrome/browser/ui/browser_navigator_params.h" 23 #include "chrome/browser/ui/browser_navigator_params.h"
24 #include "chrome/browser/ui/browser_window.h" 24 #include "chrome/browser/ui/browser_window.h"
25 #include "chrome/browser/ui/extensions/app_launch_params.h" 25 #include "chrome/browser/ui/extensions/app_launch_params.h"
26 #include "chrome/browser/ui/extensions/application_launch.h" 26 #include "chrome/browser/ui/extensions/application_launch.h"
27 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 27 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
28 #include "chrome/browser/ui/settings_window_manager.h" 28 #include "chrome/browser/ui/settings_window_manager.h"
29 #include "chrome/browser/ui/singleton_tabs.h" 29 #include "chrome/browser/ui/singleton_tabs.h"
30 #include "chrome/browser/ui/tabs/tab_strip_model.h" 30 #include "chrome/browser/ui/tabs/tab_strip_model.h"
31 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h" 31 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
32 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
33 #include "chrome/browser/ui/webui/site_settings_helper.h" 32 #include "chrome/browser/ui/webui/site_settings_helper.h"
34 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
36 #include "components/bookmarks/browser/bookmark_model.h" 35 #include "components/bookmarks/browser/bookmark_model.h"
37 #include "components/bookmarks/browser/bookmark_node.h" 36 #include "components/bookmarks/browser/bookmark_node.h"
38 #include "components/signin/core/browser/signin_header_helper.h" 37 #include "components/signin/core/browser/signin_header_helper.h"
39 #include "components/signin/core/common/profile_management_switches.h" 38 #include "components/signin/core/common/profile_management_switches.h"
40 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
41 #include "extensions/browser/extension_prefs.h" 40 #include "extensions/browser/extension_prefs.h"
42 #include "extensions/common/constants.h" 41 #include "extensions/common/constants.h"
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 SigninManagerFactory::GetForProfile(original_profile); 428 SigninManagerFactory::GetForProfile(original_profile);
430 DCHECK(manager->IsSigninAllowed()); 429 DCHECK(manager->IsSigninAllowed());
431 if (manager->IsAuthenticated()) 430 if (manager->IsAuthenticated())
432 ShowSettings(browser); 431 ShowSettings(browser);
433 else 432 else
434 ShowBrowserSignin(browser, access_point); 433 ShowBrowserSignin(browser, access_point);
435 } 434 }
436 #endif 435 #endif
437 436
438 } // namespace chrome 437 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698