| Index: chrome/browser/tab_contents/tab_contents.h
|
| diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
|
| index 0a79a83481b5e274e2fac1322933a87f36db421e..796745cff48c829787804399b13539411f9d9434 100644
|
| --- a/chrome/browser/tab_contents/tab_contents.h
|
| +++ b/chrome/browser/tab_contents/tab_contents.h
|
| @@ -38,10 +38,10 @@
|
| #include "chrome/common/property_bag.h"
|
| #include "chrome/common/renderer_preferences.h"
|
| #include "chrome/common/translate_errors.h"
|
| +#include "chrome/common/web_apps.h"
|
| #include "gfx/native_widget_types.h"
|
| #include "gfx/rect.h"
|
| #include "net/base/load_states.h"
|
| -#include "webkit/glue/dom_operations.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| @@ -287,7 +287,7 @@ class TabContents : public PageNavigator,
|
| encoding_.clear();
|
| }
|
|
|
| - const webkit_glue::WebApplicationInfo& web_app_info() const {
|
| + const WebApplicationInfo& web_app_info() const {
|
| return web_app_info_;
|
| }
|
|
|
| @@ -870,9 +870,8 @@ class TabContents : public PageNavigator,
|
| virtual void OnMissingPluginStatus(int status);
|
| virtual void OnCrashedPlugin(const FilePath& plugin_path);
|
| virtual void OnCrashedWorker();
|
| - virtual void OnDidGetApplicationInfo(
|
| - int32 page_id,
|
| - const webkit_glue::WebApplicationInfo& info);
|
| + virtual void OnDidGetApplicationInfo(int32 page_id,
|
| + const WebApplicationInfo& info);
|
| virtual void OnDisabledOutdatedPlugin(const string16& name,
|
| const GURL& update_url);
|
| virtual void OnPageContents(const GURL& url,
|
| @@ -1122,7 +1121,7 @@ class TabContents : public PageNavigator,
|
| FavIconHelper fav_icon_helper_;
|
|
|
| // Cached web app info data.
|
| - webkit_glue::WebApplicationInfo web_app_info_;
|
| + WebApplicationInfo web_app_info_;
|
|
|
| // Cached web app icon.
|
| SkBitmap app_icon_;
|
|
|