| Index: chrome/browser/android/tab_android.cc
|
| diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
|
| index e0ecd6f0265b9a8a5f9d917a213b8f75fde1d94b..57c94f131da9b250adaecc1cb41a3f8fe0a6b632 100644
|
| --- a/chrome/browser/android/tab_android.cc
|
| +++ b/chrome/browser/android/tab_android.cc
|
| @@ -81,8 +81,8 @@
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "content/public/common/browser_controls_state.h"
|
| #include "content/public/common/resource_request_body.h"
|
| -#include "content/public/common/top_controls_state.h"
|
| #include "jni/Tab_jni.h"
|
| #include "net/base/escape.h"
|
| #include "skia/ext/image_operations.h"
|
| @@ -751,10 +751,10 @@ void TabAndroid::UpdateTopControlsState(JNIEnv* env,
|
| jint constraints,
|
| jint current,
|
| jboolean animate) {
|
| - content::TopControlsState constraints_state =
|
| - static_cast<content::TopControlsState>(constraints);
|
| - content::TopControlsState current_state =
|
| - static_cast<content::TopControlsState>(current);
|
| + content::BrowserControlsState constraints_state =
|
| + static_cast<content::BrowserControlsState>(constraints);
|
| + content::BrowserControlsState current_state =
|
| + static_cast<content::BrowserControlsState>(current);
|
| WebContents* sender = web_contents();
|
| sender->Send(new ChromeViewMsg_UpdateTopControlsState(
|
| sender->GetRoutingID(), constraints_state, current_state, animate));
|
|
|