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

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

Issue 1494293004: Componentize strings from generated_resources needed by LocalizedError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS Created 5 years 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 46 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
47 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 47 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
48 #include "chrome/browser/ui/webui/options/sync_setup_handler.h" 48 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
49 #include "chrome/browser/ui/webui/theme_source.h" 49 #include "chrome/browser/ui/webui/theme_source.h"
50 #include "chrome/common/features.h" 50 #include "chrome/common/features.h"
51 #include "chrome/common/url_constants.h" 51 #include "chrome/common/url_constants.h"
52 #include "chrome/grit/generated_resources.h" 52 #include "chrome/grit/generated_resources.h"
53 #include "chrome/grit/locale_settings.h" 53 #include "chrome/grit/locale_settings.h"
54 #include "components/omnibox/browser/autocomplete_match.h" 54 #include "components/omnibox/browser/autocomplete_match.h"
55 #include "components/omnibox/browser/autocomplete_result.h" 55 #include "components/omnibox/browser/autocomplete_result.h"
56 #include "components/strings/grit/components_strings.h"
56 #include "content/public/browser/notification_types.h" 57 #include "content/public/browser/notification_types.h"
57 #include "content/public/browser/render_frame_host.h" 58 #include "content/public/browser/render_frame_host.h"
58 #include "content/public/browser/url_data_source.h" 59 #include "content/public/browser/url_data_source.h"
59 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
60 #include "content/public/browser/web_contents_delegate.h" 61 #include "content/public/browser/web_contents_delegate.h"
61 #include "content/public/browser/web_ui.h" 62 #include "content/public/browser/web_ui.h"
62 #include "grit/options_resources.h" 63 #include "grit/options_resources.h"
63 #include "grit/theme_resources.h" 64 #include "grit/theme_resources.h"
64 #include "net/base/escape.h" 65 #include "net/base/escape.h"
65 #include "ui/base/l10n/l10n_util.h" 66 #include "ui/base/l10n/l10n_util.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 // Add only if handler's service is enabled. 478 // Add only if handler's service is enabled.
478 if (handler->IsEnabled()) { 479 if (handler->IsEnabled()) {
479 // Add handler to the list and also pass the ownership. 480 // Add handler to the list and also pass the ownership.
480 web_ui()->AddMessageHandler(handler.release()); 481 web_ui()->AddMessageHandler(handler.release());
481 handler_raw->GetLocalizedValues(localized_strings); 482 handler_raw->GetLocalizedValues(localized_strings);
482 handlers_.push_back(handler_raw); 483 handlers_.push_back(handler_raw);
483 } 484 }
484 } 485 }
485 486
486 } // namespace options 487 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/options_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698