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

Side by Side Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_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/chromeos/keyboard_overlay_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "chrome/grit/chromium_strings.h"
20 #include "chrome/grit/generated_resources.h"
19 #include "chromeos/chromeos_switches.h" 21 #include "chromeos/chromeos_switches.h"
20 #include "chromeos/ime/ime_keyboard.h" 22 #include "chromeos/ime/ime_keyboard.h"
21 #include "chromeos/ime/input_method_manager.h" 23 #include "chromeos/ime/input_method_manager.h"
22 #include "content/public/browser/page_navigator.h" 24 #include "content/public/browser/page_navigator.h"
23 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_contents_delegate.h" 26 #include "content/public/browser/web_contents_delegate.h"
25 #include "content/public/browser/web_ui.h" 27 #include "content/public/browser/web_ui.h"
26 #include "content/public/browser/web_ui_data_source.h" 28 #include "content/public/browser/web_ui_data_source.h"
27 #include "content/public/browser/web_ui_message_handler.h" 29 #include "content/public/browser/web_ui_message_handler.h"
28 #include "grit/browser_resources.h" 30 #include "grit/browser_resources.h"
29 #include "grit/chromium_strings.h"
30 #include "grit/generated_resources.h"
31 31
32 using chromeos::input_method::ModifierKey; 32 using chromeos::input_method::ModifierKey;
33 using content::WebUIMessageHandler; 33 using content::WebUIMessageHandler;
34 using ui::WebDialogUI; 34 using ui::WebDialogUI;
35 35
36 namespace { 36 namespace {
37 37
38 const char kLearnMoreURL[] = 38 const char kLearnMoreURL[] =
39 #if defined(OFFICIAL_BUILD) 39 #if defined(OFFICIAL_BUILD)
40 "chrome-extension://honijodknafkokifofgiaalefdiedpko/" 40 "chrome-extension://honijodknafkokifofgiaalefdiedpko/"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 375
376 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 376 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
377 : WebDialogUI(web_ui) { 377 : WebDialogUI(web_ui) {
378 Profile* profile = Profile::FromWebUI(web_ui); 378 Profile* profile = Profile::FromWebUI(web_ui);
379 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 379 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
380 web_ui->AddMessageHandler(handler); 380 web_ui->AddMessageHandler(handler);
381 381
382 // Set up the chrome://keyboardoverlay/ source. 382 // Set up the chrome://keyboardoverlay/ source.
383 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource()); 383 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());
384 } 384 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698