Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6839)

Unified Diff: chrome/browser/ui/views/apps/native_app_window_views_win.cc

Issue 171523005: BACKUP: NativeAppWindowView - before splitting CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
}
« no previous file with comments | « chrome/browser/ui/views/apps/native_app_window_views_win.h ('k') | chrome/browser/ui/views/apps/shaped_app_window_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698