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

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

Issue 2700523002: arc: Fix crash on accessing app info for secondary user. (Closed)
Patch Set: clean up Created 3 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 unified diff | Download patch
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_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "extensions/browser/extension_registry_observer.h" 10 #include "extensions/browser/extension_registry_observer.h"
(...skipping 19 matching lines...) Expand all
30 public extensions::ExtensionRegistryObserver { 30 public extensions::ExtensionRegistryObserver {
31 public: 31 public:
32 AppInfoDialog(gfx::NativeWindow parent_window, 32 AppInfoDialog(gfx::NativeWindow parent_window,
33 Profile* profile, 33 Profile* profile,
34 const extensions::Extension* app); 34 const extensions::Extension* app);
35 ~AppInfoDialog() override; 35 ~AppInfoDialog() override;
36 36
37 private: 37 private:
38 FRIEND_TEST_ALL_PREFIXES(AppInfoDialogAshTest, 38 FRIEND_TEST_ALL_PREFIXES(AppInfoDialogAshTest,
39 PinButtonsAreFocusedAfterPinUnpin); 39 PinButtonsAreFocusedAfterPinUnpin);
40 FRIEND_TEST_ALL_PREFIXES(AppInfoDialogViewsTest, ArcAppInfoLinks);
40 41
41 // Closes the dialog. 42 // Closes the dialog.
42 void Close(); 43 void Close();
43 44
44 void StartObservingExtensionRegistry(); 45 void StartObservingExtensionRegistry();
45 void StopObservingExtensionRegistry(); 46 void StopObservingExtensionRegistry();
46 47
47 // Overridden from extensions::ExtensionRegistryObserver: 48 // Overridden from extensions::ExtensionRegistryObserver:
48 void OnExtensionUninstalled(content::BrowserContext* browser_context, 49 void OnExtensionUninstalled(content::BrowserContext* browser_context,
49 const extensions::Extension* extension, 50 const extensions::Extension* extension,
50 extensions::UninstallReason reason) override; 51 extensions::UninstallReason reason) override;
51 void OnShutdown(extensions::ExtensionRegistry* registry) override; 52 void OnShutdown(extensions::ExtensionRegistry* registry) override;
52 53
53 // UI elements of the dialog. 54 // UI elements of the dialog.
54 views::View* dialog_header_; 55 views::View* dialog_header_ = nullptr;
55 views::ScrollView* dialog_body_; 56 views::ScrollView* dialog_body_ = nullptr;
56 views::View* dialog_footer_; 57 views::View* dialog_footer_ = nullptr;
58 views::View* arc_app_info_links_ = nullptr;
57 59
58 Profile* profile_; 60 Profile* profile_;
59 std::string app_id_; 61 std::string app_id_;
60 extensions::ExtensionRegistry* extension_registry_; 62 extensions::ExtensionRegistry* extension_registry_ = nullptr;
61 63
62 DISALLOW_COPY_AND_ASSIGN(AppInfoDialog); 64 DISALLOW_COPY_AND_ASSIGN(AppInfoDialog);
63 }; 65 };
64 66
65 #endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_ 67 #endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698