Commit 06d2b36b authored by ben@chromium.org's avatar ben@chromium.org

Make KeyboardOverlayUI use WebContentsDelegate instead of BrowserList::GetLastActive().

http://crbug.com/129187
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10332293

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138311 0039d316-1c4b-4281-b951-d872f2087c98
parent 4d617833
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
#include "chrome/browser/chromeos/input_method/xkeyboard.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
#include "chrome/common/jstemplate_builder.h" #include "chrome/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/page_navigator.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_message_handler.h" #include "content/public/browser/web_ui_message_handler.h"
#include "grit/browser_resources.h" #include "grit/browser_resources.h"
...@@ -304,10 +304,13 @@ void KeyboardOverlayHandler::GetLabelMap(const ListValue* args) { ...@@ -304,10 +304,13 @@ void KeyboardOverlayHandler::GetLabelMap(const ListValue* args) {
} }
void KeyboardOverlayHandler::OpenLearnMorePage(const ListValue* args) { void KeyboardOverlayHandler::OpenLearnMorePage(const ListValue* args) {
Browser* browser = BrowserList::GetLastActive(); web_ui()->GetWebContents()->GetDelegate()->OpenURLFromTab(
DCHECK(browser); web_ui()->GetWebContents(),
browser->AddSelectedTabWithURL(GURL(kLearnMoreURL), content::OpenURLParams(GURL(kLearnMoreURL),
content::PAGE_TRANSITION_LINK); content::Referrer(),
NEW_FOREGROUND_TAB,
content::PAGE_TRANSITION_LINK,
false));
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment