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

Side by Side Diff: extensions/browser/app_window/app_window.cc

Issue 1158523002: Add user_gesture param to BaseWindow::Show Base URL: https://chromium.googlesource.com/chromium/src.git@ug3_BaseWindow_Activate
Patch Set: Update callers Created 5 years, 7 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 #include "extensions/browser/app_window/app_window.h" 5 #include "extensions/browser/app_window/app_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 show_on_first_paint_ = true; 633 show_on_first_paint_ = true;
634 634
635 if (!first_paint_complete_) { 635 if (!first_paint_complete_) {
636 delayed_show_type_ = show_type; 636 delayed_show_type_ = show_type;
637 return; 637 return;
638 } 638 }
639 } 639 }
640 640
641 switch (show_type) { 641 switch (show_type) {
642 case SHOW_ACTIVE: 642 case SHOW_ACTIVE:
643 GetBaseWindow()->Show(); 643 // TODO(johnme): Can we sometimes be certain this was for a user gesture?
644 GetBaseWindow()->Show(false /* user_gesture */);
644 break; 645 break;
645 case SHOW_INACTIVE: 646 case SHOW_INACTIVE:
646 GetBaseWindow()->ShowInactive(); 647 GetBaseWindow()->ShowInactive();
647 break; 648 break;
648 } 649 }
649 AppWindowRegistry::Get(browser_context_)->AppWindowShown(this, was_hidden); 650 AppWindowRegistry::Get(browser_context_)->AppWindowShown(this, was_hidden);
650 651
651 has_been_shown_ = true; 652 has_been_shown_ = true;
652 SendOnWindowShownIfShown(); 653 SendOnWindowShownIfShown();
653 } 654 }
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 region.bounds.x(), 1062 region.bounds.x(),
1062 region.bounds.y(), 1063 region.bounds.y(),
1063 region.bounds.right(), 1064 region.bounds.right(),
1064 region.bounds.bottom(), 1065 region.bounds.bottom(),
1065 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); 1066 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
1066 } 1067 }
1067 return sk_region; 1068 return sk_region;
1068 } 1069 }
1069 1070
1070 } // namespace extensions 1071 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698