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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 2290753004: Finish changing chrome/ grit includes to use qualified paths. (Closed)
Patch Set: Rebase, fix new unqualified include Created 4 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 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/webui/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 47 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
48 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h" 48 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
49 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 49 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
50 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 50 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
51 #include "chrome/browser/ui/webui/options/sync_setup_handler.h" 51 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
52 #include "chrome/browser/ui/webui/theme_source.h" 52 #include "chrome/browser/ui/webui/theme_source.h"
53 #include "chrome/common/features.h" 53 #include "chrome/common/features.h"
54 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
55 #include "chrome/grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
56 #include "chrome/grit/locale_settings.h" 56 #include "chrome/grit/locale_settings.h"
57 #include "chrome/grit/options_resources.h"
57 #include "chrome/grit/theme_resources.h" 58 #include "chrome/grit/theme_resources.h"
58 #include "components/omnibox/browser/autocomplete_match.h" 59 #include "components/omnibox/browser/autocomplete_match.h"
59 #include "components/omnibox/browser/autocomplete_result.h" 60 #include "components/omnibox/browser/autocomplete_result.h"
60 #include "components/strings/grit/components_strings.h" 61 #include "components/strings/grit/components_strings.h"
61 #include "content/public/browser/notification_types.h" 62 #include "content/public/browser/notification_types.h"
62 #include "content/public/browser/render_frame_host.h" 63 #include "content/public/browser/render_frame_host.h"
63 #include "content/public/browser/url_data_source.h" 64 #include "content/public/browser/url_data_source.h"
64 #include "content/public/browser/web_contents.h" 65 #include "content/public/browser/web_contents.h"
65 #include "content/public/browser/web_contents_delegate.h" 66 #include "content/public/browser/web_contents_delegate.h"
66 #include "content/public/browser/web_ui.h" 67 #include "content/public/browser/web_ui.h"
67 #include "grit/options_resources.h"
68 #include "net/base/escape.h" 68 #include "net/base/escape.h"
69 #include "ui/base/l10n/l10n_util.h" 69 #include "ui/base/l10n/l10n_util.h"
70 #include "ui/base/resource/resource_bundle.h" 70 #include "ui/base/resource/resource_bundle.h"
71 #include "ui/base/template_expressions.h" 71 #include "ui/base/template_expressions.h"
72 #include "ui/base/webui/jstemplate_builder.h" 72 #include "ui/base/webui/jstemplate_builder.h"
73 #include "ui/base/webui/web_ui_util.h" 73 #include "ui/base/webui/web_ui_util.h"
74 #include "url/gurl.h" 74 #include "url/gurl.h"
75 75
76 #if defined(ENABLE_SUPERVISED_USERS) 76 #if defined(ENABLE_SUPERVISED_USERS)
77 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h" 77 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 // Add only if handler's service is enabled. 569 // Add only if handler's service is enabled.
570 if (handler->IsEnabled()) { 570 if (handler->IsEnabled()) {
571 // Add handler to the list and also pass the ownership. 571 // Add handler to the list and also pass the ownership.
572 web_ui()->AddMessageHandler(handler.release()); 572 web_ui()->AddMessageHandler(handler.release());
573 handler_raw->GetLocalizedValues(localized_strings); 573 handler_raw->GetLocalizedValues(localized_strings);
574 handlers_.push_back(handler_raw); 574 handlers_.push_back(handler_raw);
575 } 575 }
576 } 576 }
577 577
578 } // namespace options 578 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698