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

Unified Diff: components/exo/shell_surface.h

Issue 2480713003: Window prerequisites for ShelfWindowWatcher panel support. (Closed)
Patch Set: Fix ShellSurface KAppIdKey use; remove local application_id_. Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc ('k') | components/exo/shell_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/shell_surface.h
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index 511a57cbffbca9a94e54b96981da226680a6334b..50812956af9580d53e0db3261b9d2eb5fd1e5784 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -124,13 +124,9 @@ class ShellSurface : public SurfaceDelegate,
// Sets the application ID for the window. The application ID identifies the
// general class of applications to which the window belongs.
- static void SetApplicationId(aura::Window* window,
- std::string* application_id);
+ static void SetApplicationId(aura::Window* window, const std::string& id);
static const std::string GetApplicationId(aura::Window* window);
- // Set application id for surface.
- void SetApplicationId(const std::string& application_id);
reveman 2016/11/05 01:25:52 nit: can you keep this non-static function around?
msw 2016/11/05 23:12:08 Done.
-
// Start an interactive move of surface.
void Move();
@@ -275,7 +271,6 @@ class ShellSurface : public SurfaceDelegate,
const int container_;
bool pending_show_widget_ = false;
base::string16 title_;
- std::string application_id_;
gfx::Rect geometry_;
gfx::Rect pending_geometry_;
double scale_ = 1.0;
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc ('k') | components/exo/shell_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698