← Back to branch summary

~osomon/webbrowser-app/fix-1632620-sound-yakkety

« back to all changes in this revision

Viewing changes to src/app/webcontainer/webapp-container.h

  • Committer: Bileto Bot
  • Author(s): Andrew Hayzen, Olivier Tilloy
  • Date: 2016-09-28 08:23:16 UTC
  • mfrom: (1465.2.50 multiple-windows)
  • Revision ID: ci-train-bot@canonical.com-20160928082316-wy9s4z8ozm5hqr9u
Multiple window support in webbrowser-app.

Approved by: Andrew Hayzen

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/webcontainer/webapp-container.h
1
1
/*
2
 
 * Copyright 2013 Canonical Ltd.
 
2
 * Copyright 2013-2016 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
44
44
    virtual QList<QUrl> urls() const;
45
45
 
46
46
private:
47
 
    virtual void printUsage() const;
 
47
    void printUsage() const final;
48
48
    void earlyEnvironment();
49
49
    void parseCommandLine();
50
50
    void parseExtraConfiguration();
56
56
    void setupLocalSchemeFilterIfAny(QQmlContext* context, const QString& webappSearchPath);
57
57
    QString appId() const;
58
58
 
 
59
private Q_SLOTS:
 
60
    void onNewInstanceLaunched(const QStringList& arguments) const final;
 
61
 
59
62
private:
60
63
    QString m_webappName;
61
64
    QString m_webappIcon;
74
77
    QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
75
78
    QScopedPointer<SchemeFilter> m_schemeFilter;
76
79
    QString m_defaultVideoCaptureCameraPosition;
 
80
    bool m_fullscreen;
 
81
    bool m_maximized;
77
82
 
78
83
    static const QString URL_PATTERN_SEPARATOR;
79
84
    static const QString LOCAL_SCHEME_FILTER_FILENAME;