Index: chrome/browser/ui/views/apps/native_app_window_views_win.cc |
diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.cc b/chrome/browser/ui/views/apps/native_app_window_views_win.cc |
index 3a4221ac1aac3cb8f87d131530841cae3504eb06..c32060d116f37df2fa158dea29608ab3751cf66c 100644 |
--- a/chrome/browser/ui/views/apps/native_app_window_views_win.cc |
+++ b/chrome/browser/ui/views/apps/native_app_window_views_win.cc |
@@ -63,11 +63,11 @@ void CreateIconAndSetRelaunchDetails( |
} // namespace |
-NativeAppWindowViewsWin::NativeAppWindowViewsWin() |
+ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin() |
: weak_ptr_factory_(this) { |
} |
-void NativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { |
+void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { |
if (!ash::Shell::HasInstance()) |
return; |
@@ -84,7 +84,7 @@ void NativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { |
} |
} |
-void NativeAppWindowViewsWin::OnShortcutInfoLoaded( |
+void ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded( |
const ShellIntegration::ShortcutInfo& shortcut_info) { |
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
@@ -105,11 +105,11 @@ void NativeAppWindowViewsWin::OnShortcutInfoLoaded( |
web_app_path, icon_file, shortcut_info, hwnd)); |
} |
-HWND NativeAppWindowViewsWin::GetNativeAppWindowHWND() const { |
+HWND ChromeNativeAppWindowViewsWin::GetNativeAppWindowHWND() const { |
return views::HWNDForWidget(window()->GetTopLevelWidget()); |
} |
-void NativeAppWindowViewsWin::OnBeforeWidgetInit( |
+void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit( |
views::Widget::InitParams* init_params, views::Widget* widget) { |
// If an app has any existing windows, ensure new ones are created on the |
// same desktop. |
@@ -137,7 +137,7 @@ void NativeAppWindowViewsWin::OnBeforeWidgetInit( |
init_params->native_widget = new views::DesktopNativeWidgetAura(widget); |
} |
-void NativeAppWindowViewsWin::InitializeDefaultWindow( |
+void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow( |
const apps::AppWindow::CreateParams& create_params) { |
NativeAppWindowViews::InitializeDefaultWindow(create_params); |
@@ -158,12 +158,12 @@ void NativeAppWindowViewsWin::InitializeDefaultWindow( |
weak_ptr_factory_.GetWeakPtr())); |
} |
-void NativeAppWindowViewsWin::Show() { |
+void ChromeNativeAppWindowViewsWin::Show() { |
ActivateParentDesktopIfNecessary(); |
NativeAppWindowViews::Show(); |
} |
-void NativeAppWindowViewsWin::Activate() { |
+void ChromeNativeAppWindowViewsWin::Activate() { |
ActivateParentDesktopIfNecessary(); |
NativeAppWindowViews::Activate(); |
} |