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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 unified diff | Download patch | Annotate | Revision Log
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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h" 43 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
44 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 44 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
45 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 45 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
46 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h" 46 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h"
47 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" 47 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h"
48 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h" 48 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h"
49 #include "chrome/browser/ui/webui/options/website_settings_handler.h" 49 #include "chrome/browser/ui/webui/options/website_settings_handler.h"
50 #include "chrome/browser/ui/webui/sync_setup_handler.h" 50 #include "chrome/browser/ui/webui/sync_setup_handler.h"
51 #include "chrome/browser/ui/webui/theme_source.h" 51 #include "chrome/browser/ui/webui/theme_source.h"
52 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
53 #include "chrome/grit/generated_resources.h"
53 #include "components/omnibox/autocomplete_match.h" 54 #include "components/omnibox/autocomplete_match.h"
54 #include "components/omnibox/autocomplete_result.h" 55 #include "components/omnibox/autocomplete_result.h"
55 #include "content/public/browser/notification_types.h" 56 #include "content/public/browser/notification_types.h"
56 #include "content/public/browser/render_frame_host.h" 57 #include "content/public/browser/render_frame_host.h"
57 #include "content/public/browser/url_data_source.h" 58 #include "content/public/browser/url_data_source.h"
58 #include "content/public/browser/web_contents.h" 59 #include "content/public/browser/web_contents.h"
59 #include "content/public/browser/web_contents_delegate.h" 60 #include "content/public/browser/web_contents_delegate.h"
60 #include "content/public/browser/web_ui.h" 61 #include "content/public/browser/web_ui.h"
61 #include "grit/generated_resources.h"
62 #include "grit/locale_settings.h" 62 #include "grit/locale_settings.h"
63 #include "grit/options_resources.h" 63 #include "grit/options_resources.h"
64 #include "grit/theme_resources.h" 64 #include "grit/theme_resources.h"
65 #include "net/base/escape.h" 65 #include "net/base/escape.h"
66 #include "ui/base/l10n/l10n_util.h" 66 #include "ui/base/l10n/l10n_util.h"
67 #include "ui/base/resource/resource_bundle.h" 67 #include "ui/base/resource/resource_bundle.h"
68 #include "ui/base/webui/jstemplate_builder.h" 68 #include "ui/base/webui/jstemplate_builder.h"
69 #include "ui/base/webui/web_ui_util.h" 69 #include "ui/base/webui/web_ui_util.h"
70 #include "url/gurl.h" 70 #include "url/gurl.h"
71 71
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 // Add only if handler's service is enabled. 467 // Add only if handler's service is enabled.
468 if (handler->IsEnabled()) { 468 if (handler->IsEnabled()) {
469 // Add handler to the list and also pass the ownership. 469 // Add handler to the list and also pass the ownership.
470 web_ui()->AddMessageHandler(handler.release()); 470 web_ui()->AddMessageHandler(handler.release());
471 handler_raw->GetLocalizedValues(localized_strings); 471 handler_raw->GetLocalizedValues(localized_strings);
472 handlers_.push_back(handler_raw); 472 handlers_.push_back(handler_raw);
473 } 473 }
474 } 474 }
475 475
476 } // namespace options 476 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698