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

Side by Side Diff: chrome/browser/chromeos/login/html_page_screen.cc

Issue 8233029: More Aura fixes to build with chromeos==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied sky's comments. Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/login/html_page_screen.h" 5 #include "chrome/browser/chromeos/login/html_page_screen.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 10 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
11 #include "chrome/browser/chromeos/input_method/input_method_util.h" 11 #include "chrome/browser/chromeos/input_method/input_method_util.h"
12 #include "chrome/browser/chromeos/login/screen_observer.h" 12 #include "chrome/browser/chromeos/login/screen_observer.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/views/handle_web_keyboard_event_gtk.h" 14 #include "chrome/browser/ui/views/handle_web_keyboard_event.h"
15 #include "content/browser/renderer_host/render_view_host.h" 15 #include "content/browser/renderer_host/render_view_host.h"
16 #include "content/browser/site_instance.h" 16 #include "content/browser/site_instance.h"
17 #include "content/browser/tab_contents/tab_contents.h" 17 #include "content/browser/tab_contents/tab_contents.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "views/events/event.h" 19 #include "views/events/event.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 static const char kHTMLPageDoneUrl[] = "about:blank"; 23 static const char kHTMLPageDoneUrl[] = "about:blank";
24 24
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 if (g_browser_process) { 126 if (g_browser_process) {
127 const std::string locale = g_browser_process->GetApplicationLocale(); 127 const std::string locale = g_browser_process->GetApplicationLocale();
128 input_method::InputMethodManager* manager = 128 input_method::InputMethodManager* manager =
129 input_method::InputMethodManager::GetInstance(); 129 input_method::InputMethodManager::GetInstance();
130 manager->EnableInputMethods(locale, input_method::kKeyboardLayoutsOnly, ""); 130 manager->EnableInputMethods(locale, input_method::kKeyboardLayoutsOnly, "");
131 } 131 }
132 delegate()->GetObserver()->OnExit(code); 132 delegate()->GetObserver()->OnExit(code);
133 } 133 }
134 134
135 } // namespace chromeos 135 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/language_switch_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698