| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index 6dbd5c7bea02810d2abee21f13486ee94c989980..0dba573989d60fb1e08792b0a5a4204ab5adbbd7 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -5882,7 +5882,7 @@ void TestingAutomationProvider::IsFullscreenForBrowser(Browser* browser,
|
| IPC::Message* reply_message) {
|
| DictionaryValue dict;
|
| dict.SetBoolean("result",
|
| - browser->fullscreen_controller_->IsFullscreenForBrowser());
|
| + browser->fullscreen_controller()->IsFullscreenForBrowser());
|
| AutomationJSONReply(this, reply_message).SendSuccess(&dict);
|
| }
|
|
|
| @@ -5890,7 +5890,8 @@ void TestingAutomationProvider::IsFullscreenForTab(Browser* browser,
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| DictionaryValue dict;
|
| - dict.SetBoolean("result", browser->IsFullscreenForTabOrPending());
|
| + dict.SetBoolean("result",
|
| + browser->fullscreen_controller()->IsFullscreenForTabOrPending());
|
| AutomationJSONReply(this, reply_message).SendSuccess(&dict);
|
| }
|
|
|
| @@ -5908,7 +5909,7 @@ void TestingAutomationProvider::IsMouseLockPermissionRequested(
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| bool mouse_lock = false;
|
| fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock);
|
| DictionaryValue dict;
|
| @@ -5921,7 +5922,7 @@ void TestingAutomationProvider::IsFullscreenPermissionRequested(
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| bool fullscreen = false;
|
| fullscreen_bubble::PermissionRequestedByType(type, &fullscreen, NULL);
|
| DictionaryValue dict;
|
| @@ -5933,7 +5934,7 @@ void TestingAutomationProvider::IsFullscreenBubbleDisplayed(Browser* browser,
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| DictionaryValue dict;
|
| dict.SetBoolean("result",
|
| type != FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
|
| @@ -5945,7 +5946,7 @@ void TestingAutomationProvider::IsFullscreenBubbleDisplayingButtons(
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| DictionaryValue dict;
|
| dict.SetBoolean("result", fullscreen_bubble::ShowButtonsForType(type));
|
| AutomationJSONReply(this, reply_message).SendSuccess(&dict);
|
| @@ -5957,8 +5958,9 @@ void TestingAutomationProvider::AcceptCurrentFullscreenOrMouseLockRequest(
|
| IPC::Message* reply_message) {
|
| WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser);
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| - browser->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type);
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->OnAcceptFullscreenPermission(
|
| + fullscreen_tab->GetURL(), type);
|
| AutomationJSONReply(this, reply_message).SendSuccess(NULL);
|
| }
|
|
|
| @@ -5967,8 +5969,8 @@ void TestingAutomationProvider::DenyCurrentFullscreenOrMouseLockRequest(
|
| base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| FullscreenExitBubbleType type =
|
| - browser->fullscreen_controller_->GetFullscreenExitBubbleType();
|
| - browser->OnDenyFullscreenPermission(type);
|
| + browser->fullscreen_controller()->GetFullscreenExitBubbleType();
|
| + browser->fullscreen_controller()->OnDenyFullscreenPermission(type);
|
| AutomationJSONReply(this, reply_message).SendSuccess(NULL);
|
| }
|
|
|
|
|