Move ShellWindow into apps component.

Move ShellWindow into apps component.

This involves creating a new delegate type, ShellWindow::Delegate, which
is implemented in chrome.

BUG=159366
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=208927

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=209371

[benwells, 2013-06-13 05:01:06]

miket@, could you do a full review? I'll send to non-apps and non-extensions
owners once you're happy.

Note I'm creating a chrome/browser/ui/apps folder for chrome specific apps ui
stuff. I expect there to also be a chrome/browser/apps folder in future as well,
for chrome specific apps non-ui stuff.

[benwells, 2013-06-14 01:04:20]

On 2013/06/13 05:01:06, benwells wrote:
> miket@, could you do a full review? I'll send to non-apps and non-extensions
> owners once you're happy.
> 
> Note I'm creating a chrome/browser/ui/apps folder for chrome specific apps ui
> stuff. I expect there to also be a chrome/browser/apps folder in future as
well,
> for chrome specific apps non-ui stuff.

ping miket. It's not as bad as it looks, lotsa files changed but mostly just
dealing with the file move...

[miket_OOO, 2013-06-14 20:07:50]

lgtm

https://chromiumcodereview.appspot.com/16702003/diff/12001/apps/shell_window.cc
File apps/shell_window.cc (right):

https://chromiumcodereview.appspot.com/16702003/diff/12001/apps/shell_window....
apps/shell_window.cc:345: while ((match_index = title.find(L'\n',
current_index)) != string16::npos) {
I think this deletes newlines. If I'm correct, please replace with something
like string_util::RemoveChars(). If I'm incorrect, please add a comment
explaining what this is supposed to do.

https://chromiumcodereview.appspot.com/16702003/diff/12001/chrome/browser/ext...
File chrome/browser/extensions/shell_window_registry.h (right):

https://chromiumcodereview.appspot.com/16702003/diff/12001/chrome/browser/ext...
chrome/browser/extensions/shell_window_registry.h:20: namespace apps{
oops

[benwells, 2013-06-19 09:00:20]

+sky for 
  - non-extensions chrome/browser changes
  - addition of a chrome/browser/ui/apps folder
  - new DEPS to c/b things (are temporary, will fix in a future CL).

+joi for new DEP to components/web_modal
+reed for new DEP to skia/ext and third_party/skia

https://codereview.chromium.org/16702003/diff/12001/apps/shell_window.cc
File apps/shell_window.cc (right):

https://codereview.chromium.org/16702003/diff/12001/apps/shell_window.cc#newc...
apps/shell_window.cc:345: while ((match_index = title.find(L'\n',
current_index)) != string16::npos) {
On 2013/06/14 20:07:51, miket wrote:
> I think this deletes newlines. If I'm correct, please replace with something
> like string_util::RemoveChars(). If I'm incorrect, please add a comment
> explaining what this is supposed to do.

Done. I've also made it strip newlines from the extension title if it uses that.

https://codereview.chromium.org/16702003/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/shell_window_registry.h (right):

https://codereview.chromium.org/16702003/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/shell_window_registry.h:20: namespace apps{
On 2013/06/14 20:07:51, miket wrote:
> oops

Done.

[Jói, 2013-06-19 09:53:04]

DEP to //components/web_modal LGTM.

[sky, 2013-06-19 14:16:04]

I didn't look at DEPS changes since they're in apps and extensions. I'm assuming
someone else is looking at that.

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:30: static bool
disable_external_open_for_testing_ = false;
no need for static here.

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:37: };
DISALLOW_...

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
Are you sure this doesn't crash? In particular deleting a source that is calling
you is often problematic.

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:87:
chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
If this creates a new browser how does it get shown?

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:99:
chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
Same question here.
98-105 look the same as 86-105, do you need the ifdef?

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
File chrome/browser/ui/apps/chrome_shell_window_delegate.h (right):

https://chromiumcodereview.appspot.com/16702003/diff/24001/chrome/browser/ui/...
chrome/browser/ui/apps/chrome_shell_window_delegate.h:52: };
private:DISALLOW_...

[benwells, 2013-06-25 08:36:03]

+rockot to review the changes to the #ifdeffery

Sorry for the delay, I've been travelling.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:30: static bool
disable_external_open_for_testing_ = false;
On 2013/06/19 14:16:04, sky wrote:
> no need for static here.

Done.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:37: };
On 2013/06/19 14:16:04, sky wrote:
> DISALLOW_...

Done.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
On 2013/06/19 14:16:04, sky wrote:
> Are you sure this doesn't crash? In particular deleting a source that is
calling
> you is often problematic.

I'm moving this code from shell_window.cc. The question of doing the delete here
was raised in the original review here:
https://chromiumcodereview.appspot.com/15720009.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:87:
chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
On 2013/06/19 14:16:04, sky wrote:
> If this creates a new browser how does it get shown?

Again, I'm just moving this code from shell_window.cc. rockot: do you know the
answer to the question?

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:99:
chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
On 2013/06/19 14:16:04, sky wrote:
> Same question here.
> 98-105 look the same as 86-105, do you need the ifdef?

The ifdef is needed but I've rearranged so the code isn't duplicated.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
File chrome/browser/ui/apps/chrome_shell_window_delegate.h (right):

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.h:52: };
On 2013/06/19 14:16:04, sky wrote:
> private:DISALLOW_...

Done.

[Ken Rockot(use gerrit already), 2013-06-25 14:01:05]

On 2013/06/25 08:36:03, benwells wrote:
> +rockot to review the changes to the #ifdeffery
> 
> Sorry for the delay, I've been travelling.
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:30: static bool
> disable_external_open_for_testing_ = false;
> On 2013/06/19 14:16:04, sky wrote:
> > no need for static here.
> 
> Done.
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:37: };
> On 2013/06/19 14:16:04, sky wrote:
> > DISALLOW_...
> 
> Done.
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
> On 2013/06/19 14:16:04, sky wrote:
> > Are you sure this doesn't crash? In particular deleting a source that is
> calling
> > you is often problematic.
> 
> I'm moving this code from shell_window.cc. The question of doing the delete
here
> was raised in the original review here:
> https://chromiumcodereview.appspot.com/15720009.
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:87:
> chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
> On 2013/06/19 14:16:04, sky wrote:
> > If this creates a new browser how does it get shown?
> 
> Again, I'm just moving this code from shell_window.cc. rockot: do you know the
> answer to the question?
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:99:
> chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
> On 2013/06/19 14:16:04, sky wrote:
> > Same question here.
> > 98-105 look the same as 86-105, do you need the ifdef?
> 
> The ifdef is needed but I've rearranged so the code isn't duplicated.
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> File chrome/browser/ui/apps/chrome_shell_window_delegate.h (right):
> 
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.h:52: };
> On 2013/06/19 14:16:04, sky wrote:
> > private:DISALLOW_...
> 
> Done.

lgtm

[sky, 2013-06-25 15:59:41]

Even though you're just moving code I want to make sure the issues
I've raised are addressed.

  -Scott

On Tue, Jun 25, 2013 at 1:36 AM,  <benwells@chromium.org> wrote:
> +rockot to review the changes to the #ifdeffery
>
> Sorry for the delay, I've been travelling.
>
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
>
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:30: static bool
> disable_external_open_for_testing_ = false;
> On 2013/06/19 14:16:04, sky wrote:
>>
>> no need for static here.
>
>
> Done.
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:37: };
> On 2013/06/19 14:16:04, sky wrote:
>>
>> DISALLOW_...
>
>
> Done.
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete
> source;
>
> On 2013/06/19 14:16:04, sky wrote:
>>
>> Are you sure this doesn't crash? In particular deleting a source that
>
> is calling
>>
>> you is often problematic.
>
>
> I'm moving this code from shell_window.cc. The question of doing the
> delete here was raised in the original review here:
> https://chromiumcodereview.appspot.com/15720009.
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
>
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:87:
> chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
> On 2013/06/19 14:16:04, sky wrote:
>>
>> If this creates a new browser how does it get shown?
>
>
> Again, I'm just moving this code from shell_window.cc. rockot: do you
> know the answer to the question?
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
>
> chrome/browser/ui/apps/chrome_shell_window_delegate.cc:99:
> chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
> On 2013/06/19 14:16:04, sky wrote:
>>
>> Same question here.
>> 98-105 look the same as 86-105, do you need the ifdef?
>
>
> The ifdef is needed but I've rearranged so the code isn't duplicated.
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> File chrome/browser/ui/apps/chrome_shell_window_delegate.h (right):
>
>
https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
> chrome/browser/ui/apps/chrome_shell_window_delegate.h:52: };
> On 2013/06/19 14:16:04, sky wrote:
>>
>> private:DISALLOW_...
>
>
> Done.
>
> https://codereview.chromium.org/16702003/

[Ken Rockot(use gerrit already), 2013-06-25 17:18:11]

sky please see my comments

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
source is always a fresh blank WebContents, so in this case it should never
crash. If intercepting the new-contents navigation is a bad strategy, I would
suggest removing the code and reopening issue 145646 so that link handling can
be revisited after this move is committed.

On 2013/06/25 08:36:03, benwells wrote:
> On 2013/06/19 14:16:04, sky wrote:
> > Are you sure this doesn't crash? In particular deleting a source that is
> calling
> > you is often problematic.
> 
> I'm moving this code from shell_window.cc. The question of doing the delete
here
> was raised in the original review here:
> https://chromiumcodereview.appspot.com/15720009.

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:87:
chrome::FindOrCreateTabbedBrowser(profile, chrome::GetActiveDesktop());
The following AddWebContents calls chrome::Navigate, which will show the new
browser window if needed.

On 2013/06/25 08:36:03, benwells wrote:
> On 2013/06/19 14:16:04, sky wrote:
> > If this creates a new browser how does it get shown?
> 
> Again, I'm just moving this code from shell_window.cc. rockot: do you know the
> answer to the question?

[sky, 2013-06-25 17:53:36]

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
It doesn't matter than source is a fresh webcontents. What I'm unsure of is if
the call sites for this deal correctly with 'this' being deleted.

On 2013/06/25 17:18:11, Ken Rockot wrote:
> source is always a fresh blank WebContents, so in this case it should never
> crash. If intercepting the new-contents navigation is a bad strategy, I would
> suggest removing the code and reopening issue 145646 so that link handling can
> be revisited after this move is committed.
> 
> On 2013/06/25 08:36:03, benwells wrote:
> > On 2013/06/19 14:16:04, sky wrote:
> > > Are you sure this doesn't crash? In particular deleting a source that is
> > calling
> > > you is often problematic.
> > 
> > I'm moving this code from shell_window.cc. The question of doing the delete
> here
> > was raised in the original review here:
> > https://chromiumcodereview.appspot.com/15720009.
>

[Ken Rockot(use gerrit already), 2013-06-25 22:25:51]

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
File chrome/browser/ui/apps/chrome_shell_window_delegate.cc (right):

https://codereview.chromium.org/16702003/diff/24001/chrome/browser/ui/apps/ch...
chrome/browser/ui/apps/chrome_shell_window_delegate.cc:43: delete source;
The call site in this case is always WebContentsImpl::RequestTransferURL;
specifically, it calls OpenURL which defers to the delegate's (in this case
ShellWindowLinkDelegate's) OpenURLFromTab method. 'this' is only dereferenced
thereafter if that delegate returns non-NULL, which it never does in this case.

All other interested parties are cleanly handled by WebContentsImpl's dtor.

I'm confident that this is safe, but I can understand if it is still not ideal
or comforting. We can look for a different approach if necessary.

On 2013/06/25 17:53:37, sky wrote:
> It doesn't matter than source is a fresh webcontents. What I'm unsure of is if
> the call sites for this deal correctly with 'this' being deleted.
> 
> On 2013/06/25 17:18:11, Ken Rockot wrote:
> > source is always a fresh blank WebContents, so in this case it should never
> > crash. If intercepting the new-contents navigation is a bad strategy, I
would
> > suggest removing the code and reopening issue 145646 so that link handling
can
> > be revisited after this move is committed.
> > 
> > On 2013/06/25 08:36:03, benwells wrote:
> > > On 2013/06/19 14:16:04, sky wrote:
> > > > Are you sure this doesn't crash? In particular deleting a source that is
> > > calling
> > > > you is often problematic.
> > > 
> > > I'm moving this code from shell_window.cc. The question of doing the
delete
> > here
> > > was raised in the original review here:
> > > https://chromiumcodereview.appspot.com/15720009.
> > 
>

[sky, 2013-06-25 22:40:56]

As long as its safe, I'm fine with it. Could you add a test for this logic? The
test need only create a WebContents and trigger the OpenURLFromTab path. That
way if something changes one of the memory related bots will start failing.

[benwells, 2013-06-26 02:05:16]

On 2013/06/25 22:40:56, sky wrote:
> As long as its safe, I'm fine with it. Could you add a test for this logic?
The
> test need only create a WebContents and trigger the OpenURLFromTab path. That
> way if something changes one of the memory related bots will start failing.

I've logged a bug and added a TODO. sky - if you'd prefer the test to come in
before this refactor let me know and I'll wait for it to land.

[sky, 2013-06-26 04:12:16]

TODO is fine, LGTM

[benwells, 2013-06-26 05:15:22]

+reed for reals this time for new DEPS onto skia

[reed1, 2013-06-27 00:42:55]

rubber-stamp lgtm for mentioning skia

[commit-bot: I haz the power, 2013-06-27 00:45:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/50001

[commit-bot: I haz the power, 2013-06-27 01:04:42]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-06-27 03:45:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/72001

[commit-bot: I haz the power, 2013-06-27 04:12:51]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-27 05:35:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/93001

[commit-bot: I haz the power, 2013-06-27 06:06:59]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos_clang.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-27 07:54:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/107001

[commit-bot: I haz the power, 2013-06-27 15:12:09]

Change committed as 208927

[commit-bot: I haz the power, 2013-06-28 02:42:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/127001

[commit-bot: I haz the power, 2013-06-28 04:06:43]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2013-06-28 05:57:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/134003

[commit-bot: I haz the power, 2013-06-28 06:33:13]

Retried try job too often on win_rel for step(s) base_unittests, browser_tests,
cacheinvalidation_unittests, cc_unittests, check_deps, chrome_frame_net_tests,
chrome_frame_tests, chrome_frame_unittests, chromedriver2_unittests,
components_unittests, content_browsertests, content_unittests, crypto_unittests,
gpu_unittests, installer_util_unittests, interactive_ui_tests, ipc_tests,
jingle_unittests, media_unittests, mini_installer_test, nacl_integration,
net_unittests, ppapi_unittests, printing_unittests, remoting_unittests,
sql_unittests, sync_integration_tests, sync_unit_tests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-06-28 18:28:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/134003

[commit-bot: I haz the power, 2013-06-28 18:29:09]

Failed to apply patch for
chrome/browser/ui/gtk/extensions/native_app_window_gtk.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
  Hunk #1 FAILED at 7.
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/ui/gtk/extensions/native_app_window_gtk.h.rej

Patch:       chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
Index: chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
diff --git a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
index
e01f9bde962435c5070e02a09fe80ba3e712ad53..1d6ed2b8c69b31743eacdd19655343cc91465a35
100644
--- a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
+++ b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
@@ -7,10 +7,10 @@
 
 #include <gtk/gtk.h>
 
+#include "apps/shell_window.h"
 #include "base/observer_list.h"
 #include "base/timer.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/base/gtk/gtk_signal.h"
@@ -28,8 +28,8 @@ class NativeAppWindowGtk : public NativeAppWindow,
                            public ExtensionViewGtk::Container,
                            public ui::ActiveWindowWatcherXObserver {
  public:
-  NativeAppWindowGtk(ShellWindow* shell_window,
-                     const ShellWindow::CreateParams& params);
+  NativeAppWindowGtk(apps::ShellWindow* shell_window,
+                     const apps::ShellWindow::CreateParams& params);
 
   // ui::BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
@@ -105,7 +105,7 @@ class NativeAppWindowGtk : public NativeAppWindow,
 
   void OnDebouncedBoundsChanged();
 
-  ShellWindow* shell_window_;  // weak - ShellWindow owns NativeAppWindow.
+  apps::ShellWindow* shell_window_;  // weak - ShellWindow owns
NativeAppWindow.
 
   GtkWindow* window_;
   GdkWindowState state_;

[commit-bot: I haz the power, 2013-07-01 04:09:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/163001

[commit-bot: I haz the power, 2013-07-01 04:17:23]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[commit-bot: I haz the power, 2013-07-01 04:18:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benwells@chromium.org/16702003/163001

[commit-bot: I haz the power, 2013-07-01 07:07:43]

Change committed as 209371