chrome/browser/extensions/api/identity/web_auth_flow.h - Issue 494033002: Move AppWindow to extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/identity/web_auth_flow.h

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 4 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

« no previous file with comments | « chrome/browser/extensions/api/file_system/file_system_api.cc ('k') | chrome/browser/extensions/api/identity/web_auth_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/identity/web_auth_flow.h

diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h

index 0067c0ec2cf377ea18e1a83ba2d7adf2ceade560..122547241e16775ad3eabe02cbbd7a74295b11a5 100644

--- a/chrome/browser/extensions/api/identity/web_auth_flow.h

+++ b/chrome/browser/extensions/api/identity/web_auth_flow.h

@@ -7,10 +7,10 @@

#include <string>

-#include "apps/app_window_registry.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/web_contents_observer.h"

+#include "extensions/browser/app_window/app_window_registry.h"

#include "ui/gfx/rect.h"

#include "url/gurl.h"

@@ -45,7 +45,7 @@ namespace extensions {

// a window. If a window would be required, the flow fails.

class WebAuthFlow : public content::NotificationObserver,

public content::WebContentsObserver,

- public apps::AppWindowRegistry::Observer {

+ public AppWindowRegistry::Observer {

public:

enum Mode {

INTERACTIVE, // Show UI to the user if necessary.

@@ -92,8 +92,8 @@ class WebAuthFlow : public content::NotificationObserver,

friend class ::WebAuthFlowTest;

// ::AppWindowRegistry::Observer implementation.

- virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;

- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;

+ virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE;

+ virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE;

// NotificationObserver implementation.

virtual void Observe(int type,

@@ -126,7 +126,7 @@ class WebAuthFlow : public content::NotificationObserver,

GURL provider_url_;

Mode mode_;

- apps::AppWindow* app_window_;

+ AppWindow* app_window_;

std::string app_window_key_;

bool embedded_window_created_;