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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h

Issue 589303002: App windows launched in windows ASH should not be messing with the AppUserModelId for the remote HW… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review comments Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
7 7
8 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" 8 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
9 9
10 namespace web_app { 10 namespace web_app {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // Overridden from extensions::NativeAppWindow: 47 // Overridden from extensions::NativeAppWindow:
48 virtual void UpdateShelfMenu() OVERRIDE; 48 virtual void UpdateShelfMenu() OVERRIDE;
49 49
50 // Populated if there is a glass frame, which provides special information 50 // Populated if there is a glass frame, which provides special information
51 // to the native widget implementation. This will be NULL if there is no 51 // to the native widget implementation. This will be NULL if there is no
52 // glass frame. Note, this can change from NULL to non-NULL and back again 52 // glass frame. Note, this can change from NULL to non-NULL and back again
53 // throughout the life of a window, e.g. if DWM is enabled and disabled. 53 // throughout the life of a window, e.g. if DWM is enabled and disabled.
54 GlassAppWindowFrameViewWin* glass_frame_view_; 54 GlassAppWindowFrameViewWin* glass_frame_view_;
55 55
56 // The Windows Application User Model ID identifying the app. 56 // The Windows Application User Model ID identifying the app.
57 // Not set for windows running inside Ash.
57 base::string16 app_model_id_; 58 base::string16 app_model_id_;
58 59
59 base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_; 60 base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin); 62 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
62 }; 63 };
63 64
64 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698