| OLD | NEW |
| 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/views/ash/user_action_handler.h" | 5 #include "chrome/browser/ui/views/ash/user_action_handler.h" |
| 6 | 6 |
| 7 #include "ash/wm/window_util.h" | 7 #include "ash/wm/window_util.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_list.h" | 9 #include "chrome/browser/ui/browser_list.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 | 13 |
| 14 // Returns the currently-active WebContents belonging to the active browser, or | 14 // Returns the currently-active WebContents belonging to the active browser, or |
| 15 // NULL if there's no currently-active browser. | 15 // NULL if there's no currently-active browser. |
| 16 content::WebContents* GetActiveWebContents() { | 16 content::WebContents* GetActiveWebContents() { |
| 17 Browser* browser = BrowserList::GetLastActive(); | 17 Browser* browser = BrowserList::GetLastActive(); |
| 18 if (!browser) | 18 if (!browser) |
| 19 return NULL; | 19 return NULL; |
| 20 if (!ash::wm::IsActiveWindow(browser->window()->GetNativeHandle())) | 20 if (!ash::wm::IsActiveWindow(browser->window()->GetNativeWindow())) |
| 21 return NULL; | 21 return NULL; |
| 22 | 22 |
| 23 TabContentsWrapper* wrapper = browser->GetSelectedTabContentsWrapper(); | 23 TabContentsWrapper* wrapper = browser->GetSelectedTabContentsWrapper(); |
| 24 if (!wrapper) | 24 if (!wrapper) |
| 25 return NULL; | 25 return NULL; |
| 26 return wrapper->web_contents(); | 26 return wrapper->web_contents(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 UserActionHandler::UserActionHandler() {} | 29 UserActionHandler::UserActionHandler() {} |
| 30 | 30 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 47 contents->GetController().GoForward(); | 47 contents->GetController().GoForward(); |
| 48 return true; | 48 return true; |
| 49 } | 49 } |
| 50 break; | 50 break; |
| 51 } | 51 } |
| 52 default: | 52 default: |
| 53 break; | 53 break; |
| 54 } | 54 } |
| 55 return false; | 55 return false; |
| 56 } | 56 } |
| OLD | NEW |