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

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

Issue 224943004: Revert "Revert 261654 "Move some extension constants out of //chrome."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/themes/theme_service_factory.h" 60 #include "chrome/browser/themes/theme_service_factory.h"
61 #include "chrome/browser/ui/browser_finder.h" 61 #include "chrome/browser/ui/browser_finder.h"
62 #include "chrome/browser/ui/chrome_select_file_policy.h" 62 #include "chrome/browser/ui/chrome_select_file_policy.h"
63 #include "chrome/browser/ui/host_desktop.h" 63 #include "chrome/browser/ui/host_desktop.h"
64 #include "chrome/browser/ui/options/options_util.h" 64 #include "chrome/browser/ui/options/options_util.h"
65 #include "chrome/browser/ui/webui/favicon_source.h" 65 #include "chrome/browser/ui/webui/favicon_source.h"
66 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" 66 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
67 #include "chrome/common/chrome_constants.h" 67 #include "chrome/common/chrome_constants.h"
68 #include "chrome/common/chrome_paths.h" 68 #include "chrome/common/chrome_paths.h"
69 #include "chrome/common/chrome_switches.h" 69 #include "chrome/common/chrome_switches.h"
70 #include "chrome/common/extensions/extension_constants.h"
70 #include "chrome/common/net/url_fixer_upper.h" 71 #include "chrome/common/net/url_fixer_upper.h"
71 #include "chrome/common/pref_names.h" 72 #include "chrome/common/pref_names.h"
72 #include "chrome/common/url_constants.h" 73 #include "chrome/common/url_constants.h"
73 #include "chromeos/chromeos_switches.h" 74 #include "chromeos/chromeos_switches.h"
74 #include "components/signin/core/browser/signin_manager.h" 75 #include "components/signin/core/browser/signin_manager.h"
75 #include "content/public/browser/browser_thread.h" 76 #include "content/public/browser/browser_thread.h"
76 #include "content/public/browser/download_manager.h" 77 #include "content/public/browser/download_manager.h"
77 #include "content/public/browser/navigation_controller.h" 78 #include "content/public/browser/navigation_controller.h"
78 #include "content/public/browser/notification_details.h" 79 #include "content/public/browser/notification_details.h"
79 #include "content/public/browser/notification_service.h" 80 #include "content/public/browser/notification_service.h"
(...skipping 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 void BrowserOptionsHandler::SetupEasyUnlock() { 1666 void BrowserOptionsHandler::SetupEasyUnlock() {
1666 bool has_pairing = !Profile::FromWebUI(web_ui())->GetPrefs() 1667 bool has_pairing = !Profile::FromWebUI(web_ui())->GetPrefs()
1667 ->GetDictionary(prefs::kEasyUnlockPairing)->empty(); 1668 ->GetDictionary(prefs::kEasyUnlockPairing)->empty();
1668 base::FundamentalValue has_pairing_value(has_pairing); 1669 base::FundamentalValue has_pairing_value(has_pairing);
1669 web_ui()->CallJavascriptFunction( 1670 web_ui()->CallJavascriptFunction(
1670 "BrowserOptions.updateEasyUnlock", 1671 "BrowserOptions.updateEasyUnlock",
1671 has_pairing_value); 1672 has_pairing_value);
1672 } 1673 }
1673 1674
1674 } // namespace options 1675 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/infobars/extension_infobar.cc ('k') | chrome/common/extensions/api/extension_action/action_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698