| OLD | NEW |
| 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/ui/touch/frame/touch_browser_frame_view.h" | 5 #include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | 8 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
| 9 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 minimize_button()->GetMirroredBounds().Contains(point)) | 234 minimize_button()->GetMirroredBounds().Contains(point)) |
| 235 return true; | 235 return true; |
| 236 | 236 |
| 237 return false; | 237 return false; |
| 238 } | 238 } |
| 239 | 239 |
| 240 void TouchBrowserFrameView::ActiveTabChanged(TabContentsWrapper* old_contents, | 240 void TouchBrowserFrameView::ActiveTabChanged(TabContentsWrapper* old_contents, |
| 241 TabContentsWrapper* new_contents, | 241 TabContentsWrapper* new_contents, |
| 242 int index, | 242 int index, |
| 243 bool user_gesture) { | 243 bool user_gesture) { |
| 244 if (new_contents == old_contents) | |
| 245 return; | |
| 246 | |
| 247 TabContents* contents = new_contents->tab_contents(); | 244 TabContents* contents = new_contents->tab_contents(); |
| 248 if (!TabContentsHasFocus(contents)) | 245 if (!TabContentsHasFocus(contents)) |
| 249 return; | 246 return; |
| 250 | 247 |
| 251 bool* editable = GetFocusedStateAccessor()->GetProperty( | 248 bool* editable = GetFocusedStateAccessor()->GetProperty( |
| 252 contents->property_bag()); | 249 contents->property_bag()); |
| 253 UpdateKeyboardAndLayout(editable ? *editable : false); | 250 UpdateKeyboardAndLayout(editable ? *editable : false); |
| 254 } | 251 } |
| 255 | 252 |
| 256 void TouchBrowserFrameView::TabStripEmpty() { | 253 void TouchBrowserFrameView::TabStripEmpty() { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 const chromeos::input_method::VirtualKeyboard& virtual_keyboard, | 362 const chromeos::input_method::VirtualKeyboard& virtual_keyboard, |
| 366 const std::string& virtual_keyboard_layout) { | 363 const std::string& virtual_keyboard_layout) { |
| 367 if (!keyboard_) | 364 if (!keyboard_) |
| 368 return; | 365 return; |
| 369 | 366 |
| 370 const GURL& url = virtual_keyboard.GetURLForLayout(virtual_keyboard_layout); | 367 const GURL& url = virtual_keyboard.GetURLForLayout(virtual_keyboard_layout); |
| 371 keyboard_->LoadURL(url); | 368 keyboard_->LoadURL(url); |
| 372 VLOG(1) << "VirtualKeyboardChanged: Switched to " << url.spec(); | 369 VLOG(1) << "VirtualKeyboardChanged: Switched to " << url.spec(); |
| 373 } | 370 } |
| 374 #endif | 371 #endif |
| OLD | NEW |