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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/proxy_handler.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/chromeos/proxy_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/chromeos/system/input_device_settings.h" 13 #include "chrome/browser/chromeos/system/input_device_settings.h"
14 #include "chrome/common/chrome_constants.h" 14 #include "chrome/common/chrome_constants.h"
15 #include "chrome/grit/generated_resources.h"
15 #include "chromeos/chromeos_constants.h" 16 #include "chromeos/chromeos_constants.h"
16 #include "content/public/browser/web_ui.h" 17 #include "content/public/browser/web_ui.h"
17 #include "grit/generated_resources.h"
18 #include "grit/locale_settings.h" 18 #include "grit/locale_settings.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 namespace options { 23 namespace options {
24 24
25 ProxyHandler::ProxyHandler() { 25 ProxyHandler::ProxyHandler() {
26 } 26 }
27 27
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 bool keyboard_driven_oobe = 69 bool keyboard_driven_oobe =
70 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 70 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
71 if (keyboard_driven_oobe) { 71 if (keyboard_driven_oobe) {
72 web_ui()->CallJavascriptFunction( 72 web_ui()->CallJavascriptFunction(
73 "DetailsInternetPage.initializeKeyboardFlow"); 73 "DetailsInternetPage.initializeKeyboardFlow");
74 } 74 }
75 } 75 }
76 76
77 } // namespace options 77 } // namespace options
78 } // namespace chromeos 78 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698